Merge "Allow cinder coordination backend to be configured"

ansible/group_vars/all.yml

@@ -826,6 +826,8 @@ cinder_backend_ceph: "{{ enable_ceph }}"
 cinder_backend_vmwarevc_vmdk: "no"
 cinder_volume_group: "cinder-volumes"
 cinder_target_helper: "tgtadm"
+# Valid options are [ '', redis, etcd ]
+cinder_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}"
 
 # Valid options are [ nfs, swift, ceph ]
 cinder_backup_driver: "ceph"

ansible/roles/cinder/templates/cinder.conf.j2

@@ -206,9 +206,9 @@ auth_endpoint = {{ keystone_internal_url }}
 {% endif %}
 
 [coordination]
-{% if enable_redis | bool %}
+{% if cinder_coordination_backend == 'redis' %}
 backend_url = {{ redis_connection_string }}
-{% elif enable_etcd | bool %}
+{% elif cinder_coordination_backend == 'etcd' %}
 # NOTE(jeffrey4l): python-etcd3 module do not support multi endpoint here.
 backend_url = etcd3://{{ hostvars[groups['etcd'][0]]['ansible_' + hostvars[groups['etcd'][0]]['api_interface']]['ipv4']['address'] }}:{{ etcd_client_port }}
 {% endif %}

etc/kolla/globals.yml

@@ -422,6 +422,8 @@
 #cinder_backend_ceph: "{{ enable_ceph }}"
 #cinder_backend_vmwarevc_vmdk: "no"
 #cinder_volume_group: "cinder-volumes"
+# Valid options are [ '', redis, etcd ]
+#cinder_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}"
 
 # Valid options are [ nfs, swift, ceph ]
 #cinder_backup_driver: "ceph"

releasenotes/notes/new-variable-cinder-coordination-backend-3426a4e1bd22cbbb.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Cinder coordination backend can now be configured via
+    cinder_coordination_backend variable.
+    Coordination is optional and can now be set to either redis or etcd.