openstack
/
openstack-ansible-os_manila
Code Issues Proposed changes

Merge "cleanup: config values"

This commit is contained in:
Zuul 2020-02-10 16:03:08 +00:00 committed by Gerrit Code Review
parent 67c4bc8316 0f369f4ae2
commit 037b5821f7
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_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

5
templates/manila.conf.j2
View File

@ -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 %}