Merge "remove set_configs"

docker/base/kolla-common.sh

@@ -1,22 +1,5 @@
 #!/bin/bash
 
-set_configs() {
+# Copying configs into place if needed and set run command
-    case $KOLLA_CONFIG_STRATEGY in
+python /opt/kolla/set_configs.py
-        COPY_ALWAYS)
+CMD=$(cat /run_command)
-            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
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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