diff --git a/docker/base/kolla-common.sh b/docker/base/kolla-common.sh
index cc960ca24fe239682f7472b6411393ae5c7ecb39..0cbb048211b75401da9db0cf8621127bd3ec69ce 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)
diff --git a/docker/ceilometer/ceilometer-alarm/start.sh b/docker/ceilometer/ceilometer-alarm/start.sh
index ab5501b23d91aa1ff379640833aa18403d09c37d..d98577e08ba5a3b2f013f1bd4e7e5b3ed855bb0d 100755
--- a/docker/ceilometer/ceilometer-alarm/start.sh
+++ b/docker/ceilometer/ceilometer-alarm/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 CMD="/usr/bin/ceilometer-alarm"
@@ -8,7 +7,4 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/ceilometer/ceilometer-api/start.sh b/docker/ceilometer/ceilometer-api/start.sh
index 0f660e025ada89a8c5978a8d0b8e4508fa5ac89e..6ba3cc37de09226561c63b6c9943250ad7ab1ccc 100755
--- a/docker/ceilometer/ceilometer-api/start.sh
+++ b/docker/ceilometer/ceilometer-api/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 CMD="/usr/bin/ceilometer-api"
@@ -8,9 +7,6 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Config-internal script exec out of this function, it does not return here.
-set_configs
-
 # 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
diff --git a/docker/ceilometer/ceilometer-central/start.sh b/docker/ceilometer/ceilometer-central/start.sh
index f2980a4d51ac2d1dc56861967e62c02a6fb26221..e074febc90bf34015c368306355ef6b9a2f3d111 100755
--- a/docker/ceilometer/ceilometer-central/start.sh
+++ b/docker/ceilometer/ceilometer-central/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 CMD="/usr/bin/ceilometer-agent-central"
@@ -8,7 +7,4 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/ceilometer/ceilometer-collector/start.sh b/docker/ceilometer/ceilometer-collector/start.sh
index 3a59c17d1c3ab9157ca71eb4a4ffffbc47de27aa..585e4d7f5646df5fd73f06a8abb2f767ac316e2b 100755
--- a/docker/ceilometer/ceilometer-collector/start.sh
+++ b/docker/ceilometer/ceilometer-collector/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 CMD="/usr/bin/ceilometer-collector"
@@ -8,7 +7,4 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh
index 19d90be2f9dbde6372e400b6a9008d2fc47504d0..f17a32709a1011be1c3adb5e67667bbfeb23b5bd 100755
--- a/docker/ceilometer/ceilometer-compute/start.sh
+++ b/docker/ceilometer/ceilometer-compute/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 CMD="/usr/bin/ceilometer-agent-compute"
@@ -8,7 +7,4 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/ceilometer/ceilometer-notification/start.sh b/docker/ceilometer/ceilometer-notification/start.sh
index 8ce4b4488350f2c326e67004ad26c973722f4931..a3421acaff107bd5854c9dee8c449db5b2eed630 100755
--- a/docker/ceilometer/ceilometer-notification/start.sh
+++ b/docker/ceilometer/ceilometer-notification/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 CMD="/usr/bin/ceilometer-agent-notification"
@@ -8,7 +7,4 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/ceph/ceph-mon/start.sh b/docker/ceph/ceph-mon/start.sh
index a8661d4493119b8a718ce1ae3e2c4ae680401c90..f3eb35a596d5912678453ff447b75fc32217380e 100755
--- a/docker/ceph/ceph-mon/start.sh
+++ b/docker/ceph/ceph-mon/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 CMD="/usr/bin/ceph-mon"
@@ -14,9 +13,6 @@ MON_DIR="/var/lib/ceph/mon/ceph-$(hostname)"
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 # 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
diff --git a/docker/ceph/ceph-osd/start.sh b/docker/ceph/ceph-osd/start.sh
index 501d44befd1eb4b8fba23897c2646fca27ed74aa..9a27d60cc18079735c5b0f7080b6e1b89c89c238 100755
--- a/docker/ceph/ceph-osd/start.sh
+++ b/docker/ceph/ceph-osd/start.sh
@@ -1,13 +1,9 @@
 #!/bin/bash
-set -o xtrace
 set -o errexit
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 # 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
diff --git a/docker/cinder/cinder-api/start.sh b/docker/cinder/cinder-api/start.sh
index 2c6e3922fc795937b6ea83311558d3719a16cd42..553158a826164097e7b347031d962480f4818a73 100755
--- a/docker/cinder/cinder-api/start.sh
+++ b/docker/cinder/cinder-api/start.sh
@@ -1,14 +1,9 @@
 #!/bin/bash
-
 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
diff --git a/docker/cinder/cinder-backup/start.sh b/docker/cinder/cinder-backup/start.sh
index bfa6c7878c8ac6da0bd04f31a0f43f7801dae3a4..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/cinder/cinder-backup/start.sh
+++ b/docker/cinder/cinder-backup/start.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
-
 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)
-
 exec $CMD
diff --git a/docker/cinder/cinder-scheduler/start.sh b/docker/cinder/cinder-scheduler/start.sh
index bfa6c7878c8ac6da0bd04f31a0f43f7801dae3a4..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/cinder/cinder-scheduler/start.sh
+++ b/docker/cinder/cinder-scheduler/start.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
-
 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)
-
 exec $CMD
diff --git a/docker/cinder/cinder-volume/start.sh b/docker/cinder/cinder-volume/start.sh
index bfa6c7878c8ac6da0bd04f31a0f43f7801dae3a4..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/cinder/cinder-volume/start.sh
+++ b/docker/cinder/cinder-volume/start.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
-
 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)
-
 exec $CMD
diff --git a/docker/designate/designate-api/start.sh b/docker/designate/designate-api/start.sh
index fe556225bbe960fd2f47c30e2cc31a0710ec83b4..816715fa90d73826c64eddc56f7694ec645393ec 100755
--- a/docker/designate/designate-api/start.sh
+++ b/docker/designate/designate-api/start.sh
@@ -1,15 +1,12 @@
 #!/bin/bash
-
 set -o errexit
+
 CMD="/usr/bin/designate-api"
 ARGS=""
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 # 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
diff --git a/docker/designate/designate-backend-bind9/start.sh b/docker/designate/designate-backend-bind9/start.sh
index 11922974a117a0b2939893885aa66163882702ee..bd3f8c40145807d04dea7e7d0f103fff99594077 100755
--- a/docker/designate/designate-backend-bind9/start.sh
+++ b/docker/designate/designate-backend-bind9/start.sh
@@ -1,13 +1,10 @@
 #!/bin/bash
-
 set -o errexit
+
 CMD="/usr/sbin/named"
 ARGS="-u named -g"
 
 # Execute config strategy
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/designate/designate-central/start.sh b/docker/designate/designate-central/start.sh
index eac012d3d23b7fef1ed097d80f4a06b31fb0de1d..760f7eacd2d875c51acb3bd5d3ced1968607a592 100755
--- a/docker/designate/designate-central/start.sh
+++ b/docker/designate/designate-central/start.sh
@@ -1,13 +1,10 @@
 #!/bin/bash
-
 set -o errexit
+
 CMD="/usr/bin/designate-central"
 ARGS=""
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/designate/designate-mdns/start.sh b/docker/designate/designate-mdns/start.sh
index b4bcda20cd92f763b3bf1cd5623e73ad4d776061..026e8e6c3b67db2dcc01a0f76b4f260800eb78b6 100755
--- a/docker/designate/designate-mdns/start.sh
+++ b/docker/designate/designate-mdns/start.sh
@@ -1,13 +1,10 @@
 #!/bin/bash
-
 set -o errexit
+
 CMD="/usr/bin/designate-mdns"
 ARGS=""
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/designate/designate-poolmanager/start.sh b/docker/designate/designate-poolmanager/start.sh
index 0752b9847c5b68954e30478b5e18ca3822e80d2d..a648b9b373ab60f0063658314a28968e4dcb32a5 100755
--- a/docker/designate/designate-poolmanager/start.sh
+++ b/docker/designate/designate-poolmanager/start.sh
@@ -1,13 +1,10 @@
 #!/bin/bash
-
 set -o errexit
+
 CMD="/usr/bin/designate-pool-manager"
 ARGS=""
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/designate/designate-sink/start.sh b/docker/designate/designate-sink/start.sh
index d2f93e26fcbb969e66a233e92ccec67379510dd2..94c70470c5f13c8aa19b5fa34dfef184f7783769 100755
--- a/docker/designate/designate-sink/start.sh
+++ b/docker/designate/designate-sink/start.sh
@@ -1,13 +1,10 @@
 #!/bin/bash
-
 set -o errexit
+
 CMD="/usr/bin/designate-sink"
 ARGS=""
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh
index 7ceead556ae4f489b950cdeabe21eb6e76a72d28..f4463c6faf45e28f59f1225235a1bc1ee7a7cb89 100755
--- a/docker/glance/glance-api/start.sh
+++ b/docker/glance/glance-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/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh
index 6191ce851271468326b09ba1e5b4a11887b09b8d..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/glance/glance-registry/start.sh
+++ b/docker/glance/glance-registry/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/gnocchi/gnocchi-api/start.sh b/docker/gnocchi/gnocchi-api/start.sh
index 657368a27b53447fbabc29db76fa80a9163fd361..bb91fb831fd04ca2fd59a0324cdb27fe9fe39d45 100755
--- a/docker/gnocchi/gnocchi-api/start.sh
+++ b/docker/gnocchi/gnocchi-api/start.sh
@@ -7,9 +7,6 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 # 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
diff --git a/docker/gnocchi/gnocchi-statsd/start.sh b/docker/gnocchi/gnocchi-statsd/start.sh
index 636e7132382f78ed3a7cb1e9914ac97cf77a95ef..6070a785ad93155677223160fdc127e32d745811 100755
--- a/docker/gnocchi/gnocchi-statsd/start.sh
+++ b/docker/gnocchi/gnocchi-statsd/start.sh
@@ -7,8 +7,5 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
 
diff --git a/docker/haproxy/start.sh b/docker/haproxy/start.sh
index 629c852544efabf4db64d52ef0e6a38bd6ca0d30..3bdd4018abd393eba06d4280db6915e88228b567 100755
--- a/docker/haproxy/start.sh
+++ b/docker/haproxy/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)
-
 # We are intentionally not using exec so we can reload the haproxy config later
 $CMD
 
diff --git a/docker/heat/heat-api-cfn/start.sh b/docker/heat/heat-api-cfn/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/heat/heat-api-cfn/start.sh
+++ b/docker/heat/heat-api-cfn/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/heat/heat-api/start.sh b/docker/heat/heat-api/start.sh
index a0d3d6d04125b920c1dcb4a73016ae6150b26516..b451c604c747ee771908bc6491565d5af59690aa 100755
--- a/docker/heat/heat-api/start.sh
+++ b/docker/heat/heat-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
diff --git a/docker/heat/heat-engine/start.sh b/docker/heat/heat-engine/start.sh
index db69f850943ca7f19d42682fbd49320d7d2b9820..21a783da1309c6ac90f8ef5de3024e91df689d9f 100755
--- a/docker/heat/heat-engine/start.sh
+++ b/docker/heat/heat-engine/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
diff --git a/docker/horizon/start.sh b/docker/horizon/start.sh
index 535f06b8228a3263eb7f5fe777afaf1465460502..784ff5e87fc9b927a01d53ebd74041f3e85e62c2 100755
--- a/docker/horizon/start.sh
+++ b/docker/horizon/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 # Loading common functions
@@ -11,8 +10,4 @@ if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
     source /etc/apache2/envvars
 fi
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/keepalived/start.sh b/docker/keepalived/start.sh
index 8c41a5f7de439d9a0ea418993cc893c89f19154d..1d96c3bfa55c24ac9aaf7e5c73d90959fd1de27f 100755
--- a/docker/keepalived/start.sh
+++ b/docker/keepalived/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)
-
 modprobe ip_vs
 
 # Workaround for bug #1485079
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index 91c95517cf4ccfef31fb686b4b43ded22cca2938..45c6391fc72085eb475a6971ac406ed43c89dce8 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 # Loading common functions
@@ -11,10 +10,6 @@ if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
     source /etc/apache2/envvars
 fi
 
-# 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
diff --git a/docker/logging/rsyslog/start.sh b/docker/logging/rsyslog/start.sh
index 2d40de141896ee7603c7b1da53558061dc13f1b2..fea488a622d20c1dc2bb2d1c18ada732cecd2de3 100755
--- a/docker/logging/rsyslog/start.sh
+++ b/docker/logging/rsyslog/start.sh
@@ -4,7 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD $ARGS
diff --git a/docker/magnum/magnum-api/start.sh b/docker/magnum/magnum-api/start.sh
index ed154e29a2a67925743b1aaf5794ad37ae716152..dc22cd1c6fcd6dae53110211d78ac9b762eb5e78 100755
--- a/docker/magnum/magnum-api/start.sh
+++ b/docker/magnum/magnum-api/start.sh
@@ -1,15 +1,12 @@
 #!/bin/bash
-
 set -o errexit
+
 CMD="/usr/bin/magnum-api"
 ARGS=""
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 # 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
diff --git a/docker/magnum/magnum-conductor/start.sh b/docker/magnum/magnum-conductor/start.sh
index a5c76ee8505999011c40d8560428535ff19aafa5..b96c6324fc37be27ed702487675245913f38b989 100755
--- a/docker/magnum/magnum-conductor/start.sh
+++ b/docker/magnum/magnum-conductor/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 CMD="/usr/bin/magnum-conductor"
@@ -8,7 +7,4 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 exec $CMD $ARGS
diff --git a/docker/mariadb/start.sh b/docker/mariadb/start.sh
index 69f40818c8c86123a889250af6e7694a631ad699..6d80153f052986a687c94b4525e70cdc3583551f 100755
--- a/docker/mariadb/start.sh
+++ b/docker/mariadb/start.sh
@@ -1,15 +1,8 @@
 #!/bin/bash
-
 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)
-
-# Loading functions
 source /opt/kolla/config/config-galera.sh
 
 chown mysql: /var/lib/mysql
@@ -24,5 +17,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]] && [[ ! -e /var/lib/mysql/cluster.exists ]]; t
     exit 0
 fi
 
-echo "Running command: ${CMD}"
 exec $CMD
diff --git a/docker/memcached/start.sh b/docker/memcached/start.sh
index bfa6c7878c8ac6da0bd04f31a0f43f7801dae3a4..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/memcached/start.sh
+++ b/docker/memcached/start.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
-
 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)
-
 exec $CMD
diff --git a/docker/murano/murano-api/start.sh b/docker/murano/murano-api/start.sh
index 59599398e9e28a30f098e76dbb825590e7c4bff5..05bf40eecc9b1dad7d583abf297f6d9311e6fc61 100755
--- a/docker/murano/murano-api/start.sh
+++ b/docker/murano/murano-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
diff --git a/docker/murano/murano-engine/start.sh b/docker/murano/murano-engine/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/murano/murano-engine/start.sh
+++ b/docker/murano/murano-engine/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/neutron/neutron-linuxbridge-agent/start.sh b/docker/neutron/neutron-linuxbridge-agent/start.sh
index f024726483082e4252e5dd4dc8f907f159881fa5..6c4b096794d746f6983352686293d363639234ac 100755
--- a/docker/neutron/neutron-linuxbridge-agent/start.sh
+++ b/docker/neutron/neutron-linuxbridge-agent/start.sh
@@ -5,8 +5,4 @@ set -o errexit
 source /opt/kolla/kolla-common.sh
 source /opt/kolla/config-sudoers.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/neutron/neutron-openvswitch-agent/start.sh b/docker/neutron/neutron-openvswitch-agent/start.sh
index f024726483082e4252e5dd4dc8f907f159881fa5..6c4b096794d746f6983352686293d363639234ac 100755
--- a/docker/neutron/neutron-openvswitch-agent/start.sh
+++ b/docker/neutron/neutron-openvswitch-agent/start.sh
@@ -5,8 +5,4 @@ set -o errexit
 source /opt/kolla/kolla-common.sh
 source /opt/kolla/config-sudoers.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/neutron/neutron-server/start.sh b/docker/neutron/neutron-server/start.sh
index c6ae197d420b21282b0de237bc1e8d333f655217..cf30a7f0a82a4bba657b9d0ac8aac21108a6c3d8 100755
--- a/docker/neutron/neutron-server/start.sh
+++ b/docker/neutron/neutron-server/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
diff --git a/docker/nova/nova-api/start.sh b/docker/nova/nova-api/start.sh
index c61c37febee9971d47266b8e372086ba4b7b99cc..6461777caec12405460047a8b300340ebde6bd76 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 6191ce851271468326b09ba1e5b4a11887b09b8d..a083e7baccc1e69267bfd9a779b600d2a86d5d22 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 6191ce851271468326b09ba1e5b4a11887b09b8d..a083e7baccc1e69267bfd9a779b600d2a86d5d22 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 6191ce851271468326b09ba1e5b4a11887b09b8d..a083e7baccc1e69267bfd9a779b600d2a86d5d22 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 6191ce851271468326b09ba1e5b4a11887b09b8d..a083e7baccc1e69267bfd9a779b600d2a86d5d22 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 2f8254b890e4cf6915afd91cb726b9bec2a2477d..a083e7baccc1e69267bfd9a779b600d2a86d5d22 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 6191ce851271468326b09ba1e5b4a11887b09b8d..a083e7baccc1e69267bfd9a779b600d2a86d5d22 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 6191ce851271468326b09ba1e5b4a11887b09b8d..a083e7baccc1e69267bfd9a779b600d2a86d5d22 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
diff --git a/docker/openvswitch/ovs-db-server/start.sh b/docker/openvswitch/ovs-db-server/start.sh
index 4d3d772cc1bbcb4af1671af7e2080c75dc4e8453..60347b2dca13325b37d54f19e0ade5d695238a6d 100755
--- a/docker/openvswitch/ovs-db-server/start.sh
+++ b/docker/openvswitch/ovs-db-server/start.sh
@@ -4,9 +4,6 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 mkdir -p "/run/openvswitch"
 if [[ ! -e "/etc/openvswitch/conf.db" ]]; then
     ovsdb-tool create "/etc/openvswitch/conf.db"
diff --git a/docker/openvswitch/ovs-vswitchd/start.sh b/docker/openvswitch/ovs-vswitchd/start.sh
index 792954bb489948ef4c9fb9b3f383e9ea42ae8a62..b72ba5a2e543e0317774a344aad9f3172384a992 100755
--- a/docker/openvswitch/ovs-vswitchd/start.sh
+++ b/docker/openvswitch/ovs-vswitchd/start.sh
@@ -4,9 +4,6 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 modprobe openvswitch
 
 exec $CMD
diff --git a/docker/rabbitmq/start.sh b/docker/rabbitmq/start.sh
index 9e7108c3d346f6e8a2da3d309d34dafce3092bcb..1a018bc89e007dc190b09240c5301cece0254845 100755
--- a/docker/rabbitmq/start.sh
+++ b/docker/rabbitmq/start.sh
@@ -1,15 +1,8 @@
 #!/bin/bash
-
 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)
-
-# loading functions
 source /opt/kolla/config-rabbit.sh
 
 # This catches all cases of the BOOTSTRAP variable being set, including empty
@@ -18,5 +11,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     exit 0
 fi
 
-echo "Running command: ${CMD}"
 exec $CMD
diff --git a/docker/swift/swift-account-auditor/start.sh b/docker/swift/swift-account-auditor/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-account-auditor/start.sh
+++ b/docker/swift/swift-account-auditor/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-account-reaper/start.sh b/docker/swift/swift-account-reaper/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-account-reaper/start.sh
+++ b/docker/swift/swift-account-reaper/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-account-replicator/start.sh b/docker/swift/swift-account-replicator/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-account-replicator/start.sh
+++ b/docker/swift/swift-account-replicator/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-account-server/start.sh b/docker/swift/swift-account-server/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-account-server/start.sh
+++ b/docker/swift/swift-account-server/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-container-auditor/start.sh b/docker/swift/swift-container-auditor/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-container-auditor/start.sh
+++ b/docker/swift/swift-container-auditor/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-container-replicator/start.sh b/docker/swift/swift-container-replicator/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-container-replicator/start.sh
+++ b/docker/swift/swift-container-replicator/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-container-server/start.sh b/docker/swift/swift-container-server/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-container-server/start.sh
+++ b/docker/swift/swift-container-server/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-container-updater/start.sh b/docker/swift/swift-container-updater/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-container-updater/start.sh
+++ b/docker/swift/swift-container-updater/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-object-auditor/start.sh b/docker/swift/swift-object-auditor/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-object-auditor/start.sh
+++ b/docker/swift/swift-object-auditor/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-object-expirer/start.sh b/docker/swift/swift-object-expirer/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-object-expirer/start.sh
+++ b/docker/swift/swift-object-expirer/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-object-replicator/start.sh b/docker/swift/swift-object-replicator/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-object-replicator/start.sh
+++ b/docker/swift/swift-object-replicator/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-object-server/start.sh b/docker/swift/swift-object-server/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-object-server/start.sh
+++ b/docker/swift/swift-object-server/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-object-updater/start.sh b/docker/swift/swift-object-updater/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-object-updater/start.sh
+++ b/docker/swift/swift-object-updater/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/swift/swift-proxy-server/start.sh b/docker/swift/swift-proxy-server/start.sh
index 7adad007aee7fbf3e389163ef8da9353d950c8ed..2fbfc301239b21108f334cf15ac4724ff916e671 100755
--- a/docker/swift/swift-proxy-server/start.sh
+++ b/docker/swift/swift-proxy-server/start.sh
@@ -5,8 +5,4 @@ set -o errexit
 source /opt/kolla/kolla-common.sh
 source /opt/kolla/config-swift.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-rsyncd/start.sh b/docker/swift/swift-rsyncd/start.sh
index d43e035812d1eef27daf45c0254ea4b6d105b148..a083e7baccc1e69267bfd9a779b600d2a86d5d22 100755
--- a/docker/swift/swift-rsyncd/start.sh
+++ b/docker/swift/swift-rsyncd/start.sh
@@ -4,8 +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)
-
 exec $CMD
diff --git a/docker/zaqar/start.sh b/docker/zaqar/start.sh
index fa10502805c7caf40bb71fbd7d8dd7a1d853b083..c5f1dea7ff42374a9b6b4944b2bbcbe492f650c2 100755
--- a/docker/zaqar/start.sh
+++ b/docker/zaqar/start.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -o errexit
 
 CMD="/usr/bin/zaqar-server"
@@ -8,9 +7,6 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
 # 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