From 2c8ca64856071bc1fec5d7c2e42ad8a02d26ed92 Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Fri, 3 Jul 2015 17:00:14 +0200
Subject: [PATCH] Fix CONFIG_STRATEGY var in bash scripts
It should read KOLLA_CONFIG_STRATEGY.
Change-Id: I1819b4b1b6e28e8f83ad01c078d4c6e4c502587e
Partial-bug: #1471326
---
docker/common/base/kolla-common.sh | 2 +-
tools/genenv | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/common/base/kolla-common.sh b/docker/common/base/kolla-common.sh
index bd6a539a0b..e7fb0629b7 100644
--- a/docker/common/base/kolla-common.sh
+++ b/docker/common/base/kolla-common.sh
@@ -187,7 +187,7 @@ set_configs() {
;;
*)
- echo '$CONFIG_STRATEGY is not set properly'
+ echo '$KOLLA_CONFIG_STRATEGY is not set properly'
exit 1
;;
esac
diff --git a/tools/genenv b/tools/genenv
index cc3a31686e..3a547c1dbd 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -246,7 +246,7 @@ export OS_VOLUME_API_VERSION=$CINDER_API_VERSION
EOF
cat > ./compose/openstack.env <<EOF
-CONFIG_STRATEGY=CONFIG_INTERNAL
+KOLLA_CONFIG_STRATEGY=CONFIG_INTERNAL
DEBUG_LOGGING=$DEBUG_LOGGING
VERBOSE_LOGGING=$VERBOSE_LOGGING
NOVA_LOG_DIR=$NOVA_LOG_DIR