From 9b384da306275b91efd84573e48682d83347854a Mon Sep 17 00:00:00 2001
From: James Kirsch <generalfuzz@gmail.com>
Date: Tue, 25 Feb 2020 10:08:54 -0800
Subject: [PATCH] CI: Fix TLS upgrade test

Fix the upgrade TLS scenario in zuul to generate self signed
certificates and to configure TLS to be enabled in the open stack
deployment.

Change-Id: Icacc28eed6ad5b81fc3954db80486d9d7f24c082
Partially-Implements: blueprint custom-cacerts
---
 tests/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/upgrade.sh b/tests/upgrade.sh
index 63a3fa85fe..a712bdc016 100755
--- a/tests/upgrade.sh
+++ b/tests/upgrade.sh
@@ -10,7 +10,7 @@ export PYTHONUNBUFFERED=1
 function upgrade {
     RAW_INVENTORY=/etc/kolla/inventory
     # generate self-signed certificates for the optional internal TLS tests
-    if [[ $SCENARIO == "tls" ]]; then
+    if [[ "$TLS_ENABLED" = "True" ]]; then
         tools/kolla-ansible -i ${RAW_INVENTORY} -vvv certificates > /tmp/logs/ansible/certificates
     fi
     tools/kolla-ansible -i ${RAW_INVENTORY} -vvv prechecks &> /tmp/logs/ansible/upgrade-prechecks