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/nova/nova-api/start.sh         | 5 -----
 docker/nova/nova-compute/start.sh     | 5 -----
 docker/nova/nova-conductor/start.sh   | 5 -----
 docker/nova/nova-consoleauth/start.sh | 5 -----
 docker/nova/nova-libvirt/start.sh     | 5 -----
 docker/nova/nova-network/start.sh     | 4 ----
 docker/nova/nova-novncproxy/start.sh  | 5 -----
 docker/nova/nova-scheduler/start.sh   | 5 -----
 8 files changed, 39 deletions(-)

(limited to 'docker/nova')

diff --git a/docker/nova/nova-api/start.sh b/docker/nova/nova-api/start.sh
index c61c37feb..6461777ca 100755
--- a/docker/nova/nova-api/start.sh
+++ b/docker/nova/nova-api/start.sh
@@ -4,10 +4,6 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# 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.
 if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
@@ -15,5 +11,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     exit 0
 fi
 
-echo "Running command: ${CMD}"
 exec $CMD
diff --git a/docker/nova/nova-compute/start.sh b/docker/nova/nova-compute/start.sh
index 6191ce851..a083e7bac 100755
--- a/docker/nova/nova-compute/start.sh
+++ b/docker/nova/nova-compute/start.sh
@@ -4,9 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
-echo "Running command: ${CMD}"
 exec $CMD
diff --git a/docker/nova/nova-conductor/start.sh b/docker/nova/nova-conductor/start.sh
index 6191ce851..a083e7bac 100755
--- a/docker/nova/nova-conductor/start.sh
+++ b/docker/nova/nova-conductor/start.sh
@@ -4,9 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
-echo "Running command: ${CMD}"
 exec $CMD
diff --git a/docker/nova/nova-consoleauth/start.sh b/docker/nova/nova-consoleauth/start.sh
index 6191ce851..a083e7bac 100755
--- a/docker/nova/nova-consoleauth/start.sh
+++ b/docker/nova/nova-consoleauth/start.sh
@@ -4,9 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
-echo "Running command: ${CMD}"
 exec $CMD
diff --git a/docker/nova/nova-libvirt/start.sh b/docker/nova/nova-libvirt/start.sh
index 6191ce851..a083e7bac 100755
--- a/docker/nova/nova-libvirt/start.sh
+++ b/docker/nova/nova-libvirt/start.sh
@@ -4,9 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
-echo "Running command: ${CMD}"
 exec $CMD
diff --git a/docker/nova/nova-network/start.sh b/docker/nova/nova-network/start.sh
index 2f8254b89..a083e7bac 100755
--- a/docker/nova/nova-network/start.sh
+++ b/docker/nova/nova-network/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
-echo "Running command: ${CMD}"
 exec $CMD
diff --git a/docker/nova/nova-novncproxy/start.sh b/docker/nova/nova-novncproxy/start.sh
index 6191ce851..a083e7bac 100755
--- a/docker/nova/nova-novncproxy/start.sh
+++ b/docker/nova/nova-novncproxy/start.sh
@@ -4,9 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
-echo "Running command: ${CMD}"
 exec $CMD
diff --git a/docker/nova/nova-scheduler/start.sh b/docker/nova/nova-scheduler/start.sh
index 6191ce851..a083e7bac 100755
--- a/docker/nova/nova-scheduler/start.sh
+++ b/docker/nova/nova-scheduler/start.sh
@@ -4,9 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
-echo "Running command: ${CMD}"
 exec $CMD
-- 
cgit v1.2.3