From 5ad2d4e9c6470e9a35ef5283f592823714923cd4 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 31 Mar 2016 16:19:41 +0100 Subject: [PATCH] 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 --- templates/cinder.conf.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2 index 0bdab63f..e0d3ba7b 100644 --- a/templates/cinder.conf.j2 +++ b/templates/cinder.conf.j2 @@ -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 }}