From 0cc328c625498192d5eeaeaac04d5a397737b271 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 25 Sep 2015 10:47:36 +0000
Subject: Replace config-external - murano

Change-Id: I8c5fdb2f2d3284960318a8189c4cc5bd6a8e59e9
Partially-Implements: blueprint replace-config-external
---
 docker/murano/murano-api/start.sh    | 10 ++++------
 docker/murano/murano-engine/start.sh | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'docker')

diff --git a/docker/murano/murano-api/start.sh b/docker/murano/murano-api/start.sh
index 7d712177d..59599398e 100755
--- a/docker/murano/murano-api/start.sh
+++ b/docker/murano/murano-api/start.sh
@@ -1,14 +1,12 @@
 #!/bin/bash
 set -o errexit
 
-CMD="/usr/bin/murano-api"
-ARGS="--config-file /etc/murano/murano.conf"
-
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
+# Generate run command
+python /opt/kolla/set_configs.py
+CMD=$(cat /run_command)
 
 # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
 # of the KOLLA_BOOTSTRAP variable being set, including empty.
@@ -17,4 +15,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     exit 0
 fi
 
-exec $CMD $ARGS
+exec $CMD
diff --git a/docker/murano/murano-engine/start.sh b/docker/murano/murano-engine/start.sh
index 22834fc4c..d43e03581 100755
--- a/docker/murano/murano-engine/start.sh
+++ b/docker/murano/murano-engine/start.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 set -o errexit
 
-CMD="/usr/bin/murano-engine"
-ARGS="--config-file /etc/murano/murano.conf"
-
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
+# Generate run command
+python /opt/kolla/set_configs.py
+CMD=$(cat /run_command)
 
-exec $CMD $ARGS
+exec $CMD
-- 
cgit v1.2.3