openstack
/
openstack-ansible-os_cinder
Code Issues Proposed changes

Allow the use of cinder_glance_host or cinder_glance_api_servers 

Change Iad691c32a6eafa2cddee29659a74df142240b142 implemented the use of the
correct option for Cinder to contact the Glance API servers, but this was
done without first ensuring that the integrated build included the
appropriate variable to action it. The integrated gate is broken as a result
of this.

This patch allows either configuration to be used which will allow the
integrated gate to continue working until the appropriate patch has merged.

Change-Id: I404bf891ded25b54a808013da5df3a20d676f907
This commit is contained in:
Jesse Pretorius 2016-03-31 16:19:41 +01:00
parent e4f53b2852
commit 5ad2d4e9c6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/cinder.conf.j2
View File

@ -61,7 +61,13 @@ nova_catalog_info = {{ cinder_nova_catalog_info }}
nova_catalog_admin_info = {{ cinder_nova_catalog_admin_info }}
## Glance
# TODO(odyssey4me): Remove this conditional once https://review.openstack.org/299928 has merged
{% if cinder_glance_api_servers is defined %}
glance_api_servers = {{ cinder_glance_api_servers }}
{% else %}
glance_host = {{ cinder_glance_host }}
glance_port = 9292
{% endif %}
glance_num_retries = 0
glance_api_version = {{ cinder_glance_api_version }}