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

ansible/group_vars/all.yml

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

ansible/roles/manila/tasks/config.yml

@@ -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"

ansible/roles/manila/templates/manila-share.conf.j2

@@ -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 = {{ driver_handles_share_servers }}
-driver_handles_share_servers = True
-{% elif manila_dhss == "False" %}
-driver_handles_share_servers = False
-{% endif %}
 
 # 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.

etc/kolla/globals.yml

@@ -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"
 
 
 ##################################