From 0f369f4ae2d9979fc8743d7f7190b32bf50369ce Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Thu, 30 Jan 2020 11:05:16 +0100
Subject: [PATCH] cleanup: config values

There are certain configuration values which are defaults and have
no purpose in being overwritten, users can use the overrides.

Also, some have been removed because they don't exist inside manila
anymore.

Change-Id: I1fada7b36fc0aae81f6adf5bc28035777e255eef
---
 defaults/main.yml        | 4 ----
 templates/manila.conf.j2 | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 0e7f81c..525ffd7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -151,8 +151,6 @@ manila_service_v2_adminurl: "{{ manila_service_adminuri }}/v2/%(tenant_id)s"
 manila_service_v2_internaluri: "{{ manila_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ manila_service_port }}"
 manila_service_v2_internalurl: "{{ manila_service_internaluri }}/v2/%(tenant_id)s"
 
-manila_auth_strategy: keystone
-
 ## Keystone authentication middleware
 manila_keystone_auth_plugin: "{{ manila_keystone_auth_type }}"
 manila_keystone_auth_type: password
@@ -173,8 +171,6 @@ manila_profiler_enabled: false
 # manila_profiler_hmac_key is set in user_secrets.yml
 manila_profiler_trace_sqlalchemy: false
 
-manila_client_socket_timeout: 900
-
 ## Manila quota
 manila_quota_shares: 50
 manila_quota_snapshots: 50
diff --git a/templates/manila.conf.j2 b/templates/manila.conf.j2
index 7f8a87b..c5fcd71 100644
--- a/templates/manila.conf.j2
+++ b/templates/manila.conf.j2
@@ -15,7 +15,6 @@ osapi_share_workers = {{ manila_osapi_share_workers }}
 
 rootwrap_config = /etc/manila/rootwrap.conf
 api_paste_config = /etc/manila/api-paste.ini
-auth_strategy = {{ manila_auth_strategy }}
 
 ## RabbitMQ RPC
 executor_thread_pool_size = {{ manila_rpc_executor_thread_pool_size }}
@@ -30,12 +29,8 @@ quota_gigabytes = {{ manila_quota_gigabytes }}
 quota_snapshot_gigabytes = {{ manila_quota_snapshot_gigabytes }}
 quota_share_networks = {{ manila_quota_share_networks }}
 
-os_region_name = {{ manila_service_region }}
-
 storage_availability_zone = {{ manila_storage_availability_zone }}
 
-client_socket_timeout = {{ manila_client_socket_timeout }}
-
 {% if manila_enabled_share_protocols is defined %}
 enabled_share_protocols={{ manila_enabled_share_protocols | join(',') }}
 {% endif %}