From 160f1cc0116bf93cfceffeb0149e525ba08eed3f Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Sun, 27 Sep 2015 11:38:25 +0000
Subject: remove set_configs

Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279
Partially-Implements: blueprint replace-config-external
---
 docker/base/kolla-common.sh | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'docker/base')

diff --git a/docker/base/kolla-common.sh b/docker/base/kolla-common.sh
index cc960ca24..0cbb04821 100644
--- a/docker/base/kolla-common.sh
+++ b/docker/base/kolla-common.sh
@@ -1,22 +1,5 @@
 #!/bin/bash
 
-set_configs() {
-    case $KOLLA_CONFIG_STRATEGY in
-        COPY_ALWAYS)
-            source /opt/kolla/config-external.sh
-            ;;
-        COPY_ONCE)
-            if [[ -f /configured ]]; then
-                echo 'INFO - This container has already been configured; Refusing to copy new configs'
-            else
-                source /opt/kolla/config-external.sh
-                touch /configured
-            fi
-            ;;
-
-        *)
-            echo '$KOLLA_CONFIG_STRATEGY is not set properly'
-            exit 1
-            ;;
-    esac
-}
+# Copying configs into place if needed and set run command
+python /opt/kolla/set_configs.py
+CMD=$(cat /run_command)
-- 
cgit v1.2.3