diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-12 20:11:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-12 20:11:05 +0000 |
| commit | a9c41a382147c03e97f2421ae339dafc644ab2af (patch) | |
| tree | bf9a5c4e9b19be692438cf7fd179f9a30579981c | |
| parent | 28b80a08cf843f509346bfb67d732c605540d4f6 (diff) | |
| parent | 3091f94a0779b279fc8c4c754aa4adab74ad38f4 (diff) | |
| download | kolla-a9c41a382147c03e97f2421ae339dafc644ab2af.tar.gz kolla-a9c41a382147c03e97f2421ae339dafc644ab2af.zip | |
Merge "Fix manila_share container isn't up after deploy"
| -rw-r--r-- | ansible/group_vars/all.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/manila/tasks/config.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/manila/templates/manila-share.conf.j2 | 6 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 15ccc94b4..7cc6dcab3 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -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" diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml index 6b4cb91f2..4f83ff55b 100644 --- a/ansible/roles/manila/tasks/config.yml +++ b/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" diff --git a/ansible/roles/manila/templates/manila-share.conf.j2 b/ansible/roles/manila/templates/manila-share.conf.j2 index b604a0de5..b08718ef8 100644 --- a/ansible/roles/manila/templates/manila-share.conf.j2 +++ b/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 = 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. diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 2ab095832..843cf699b 100644 --- a/etc/kolla/globals.yml +++ b/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" ################################## |