From 4e0c72cfe97259f41fcb76fba7c3fe0c326e44a7 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 21 Nov 2017 09:38:41 +0000
Subject: [PATCH] Template api/registry enablement settings properly

If a deployer sets the boolean vars to 'yes', 'no' or
other equivalent booleans valid for ansible, the glance
services will currently use those in the .conf files
and it will break.

This patch ensures that we cast the output into the
.conf files properly so that regardless of the input,
the output is correct.

The tests are adjusted to deliberately use one of the
Ansible boolean values instead of a python boolean to
validate that this works.

Change-Id: I267b97da618bbda05140d2a0332798fc77db06a5
---
 templates/glance-api.conf.j2      | 8 ++++----
 templates/glance-registry.conf.j2 | 8 ++++----
 tox.ini                           | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2
index d2195945..f767a714 100644
--- a/templates/glance-api.conf.j2
+++ b/templates/glance-api.conf.j2
@@ -17,10 +17,10 @@ registry_port = {{ glance_registry_service_port }}
 registry_client_protocol = {{ glance_service_registry_proto }}
 cinder_catalog_info = volume:cinder:internalURL
 
-enable_v1_api = {{ glance_enable_v1_api }}
-enable_v1_registry = {{ glance_enable_v1_api }}
-enable_v2_api = {{ glance_enable_v2_api }}
-enable_v2_registry = {{ glance_enable_v2_registry }}
+enable_v1_api = {{ glance_enable_v1_api | bool }}
+enable_v1_registry = {{ glance_enable_v1_api | bool }}
+enable_v2_api = {{ glance_enable_v2_api | bool }}
+enable_v2_registry = {{ glance_enable_v2_registry | bool }}
 
 {% if glance_enable_v2_registry | bool %}
 data_api = glance.db.registry.api
diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2
index 39611d46..71c490f9 100644
--- a/templates/glance-registry.conf.j2
+++ b/templates/glance-registry.conf.j2
@@ -14,10 +14,10 @@ workers = {{ glance_registry_workers | default(glance_api_threads) }}
 api_limit_max = 1000
 limit_param_default = 25
 
-enable_v1_api = {{ glance_enable_v1_api }}
-enable_v1_registry = {{ glance_enable_v1_api }}
-enable_v2_api = {{ glance_enable_v2_api }}
-enable_v2_registry = {{ glance_enable_v2_registry }}
+enable_v1_api = {{ glance_enable_v1_api | bool }}
+enable_v1_registry = {{ glance_enable_v1_api | bool }}
+enable_v2_api = {{ glance_enable_v2_api | bool }}
+enable_v2_registry = {{ glance_enable_v2_registry | bool }}
 
 transport_url = rabbit://{% for host in glance_rabbitmq_servers.split(',') %}{{ glance_rabbitmq_userid }}:{{ glance_rabbitmq_password }}@{{ host }}:{{ glance_rabbitmq_port }}{% if not loop.last %},{% else %}/{{ glance_rabbitmq_vhost }}{% endif %}{% endfor %}
 
diff --git a/tox.ini b/tox.ini
index 2574bb46..6e4f9e62 100644
--- a/tox.ini
+++ b/tox.ini
@@ -119,7 +119,7 @@ deps =
     {[testenv:ansible]deps}
 setenv =
     {[testenv]setenv}
-    ANSIBLE_PARAMETERS=-e glance_enable_v1_api=True
+    ANSIBLE_PARAMETERS=-e glance_enable_v1_api=yes
 commands =
     bash -c "{toxinidir}/tests/tests-repo-clone.sh"
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
@@ -130,7 +130,7 @@ deps =
     {[testenv:ansible]deps}
 setenv =
     {[testenv]setenv}
-    ANSIBLE_PARAMETERS=-e glance_enable_v2_registry=True
+    ANSIBLE_PARAMETERS=-e glance_enable_v2_registry=yes
 commands =
     bash -c "{toxinidir}/tests/tests-repo-clone.sh"
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"