openstack/openstack-ansible-os_manila
Code Issues Proposed changes

cleanup: config values

Browse Source 
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
This commit is contained in:
Mohammed Naser 2020-01-30 11:05:16 +01:00
parent a97cbbd565
commit 0f369f4ae2
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -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_internaluri: "{{ manila_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ manila_service_port }}"
manila_service_v2_internalurl: "{{ manila_service_internaluri }}/v2/%(tenant_id)s" manila_service_v2_internalurl: "{{ manila_service_internaluri }}/v2/%(tenant_id)s"
manila_auth_strategy: keystone
## Keystone authentication middleware ## Keystone authentication middleware
manila_keystone_auth_plugin: "{{ manila_keystone_auth_type }}" manila_keystone_auth_plugin: "{{ manila_keystone_auth_type }}"
manila_keystone_auth_type: password 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_hmac_key is set in user_secrets.yml
manila_profiler_trace_sqlalchemy: false manila_profiler_trace_sqlalchemy: false
manila_client_socket_timeout: 900
## Manila quota ## Manila quota
manila_quota_shares: 50 manila_quota_shares: 50
manila_quota_snapshots: 50 manila_quota_snapshots: 50

5
templates/manila.conf.j2
View File

@ -15,7 +15,6 @@ osapi_share_workers = {{ manila_osapi_share_workers }}
rootwrap_config = /etc/manila/rootwrap.conf rootwrap_config = /etc/manila/rootwrap.conf
api_paste_config = /etc/manila/api-paste.ini api_paste_config = /etc/manila/api-paste.ini
auth_strategy = {{ manila_auth_strategy }}
## RabbitMQ RPC ## RabbitMQ RPC
executor_thread_pool_size = {{ manila_rpc_executor_thread_pool_size }} 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_snapshot_gigabytes = {{ manila_quota_snapshot_gigabytes }}
quota_share_networks = {{ manila_quota_share_networks }} quota_share_networks = {{ manila_quota_share_networks }}
os_region_name = {{ manila_service_region }}
storage_availability_zone = {{ manila_storage_availability_zone }} storage_availability_zone = {{ manila_storage_availability_zone }}
client_socket_timeout = {{ manila_client_socket_timeout }}
{% if manila_enabled_share_protocols is defined %} {% if manila_enabled_share_protocols is defined %}
enabled_share_protocols={{ manila_enabled_share_protocols | join(',') }} enabled_share_protocols={{ manila_enabled_share_protocols | join(',') }}
{% endif %} {% endif %}