Merge "Fix manila_share container isn't up after deploy"

This commit is contained in:
Jenkins 2016-09-12 20:11:05 +00:00 committed by Gerrit Code Review
commit a9c41a3821
4 changed files with 5 additions and 8 deletions

View File

@ -375,5 +375,4 @@ ceph_cache_rule: "cache host firstn"
#######################################
# Manila - Shared File Systems Options
#######################################
manila_enable_dhss: "yes"
manila_dhss: "{{ 'True' if manila_enable_dhss | bool else 'False' }}"
driver_handles_share_servers: "True"

View File

@ -46,6 +46,7 @@
- "{{ node_custom_config }}/database.conf"
- "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/manila.conf"
- "{{ node_custom_config }}/{{ item }}.conf"
- "{{ node_custom_config }}/manila/{{ item }}.conf"
- "{{ node_custom_config }}/manila/{{ inventory_hostname }}/manila.conf"
dest: "{{ node_config_directory }}/{{ item }}/manila.conf"

View File

@ -62,11 +62,7 @@ interface_driver = manila.network.linux.interface.BridgeInterfaceDriver
# Generic driver supports both driver modes - with and without handling
# of share servers. So, we need to define explicitly which one we are
# enabling using this driver.
{% if manila_dhss == "True" %}
driver_handles_share_servers = True
{% elif manila_dhss == "False" %}
driver_handles_share_servers = False
{% endif %}
driver_handles_share_servers = {{ driver_handles_share_servers }}
# Generic driver is the only driver that uses image from Glance for building
# service VMs in Nova. And following are data for some specific image.

View File

@ -201,7 +201,8 @@ kolla_internal_vip_address: "10.10.10.254"
#######################################
# Manila - Shared File Systems Options
#######################################
#manila_enable_dhss: "yes"
# Valid options are [ True, False ]
#driver_handles_share_servers: "True"
##################################