Merge "remove set_configs"

docker/base/kolla-common.sh

 #!/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)

docker/ceilometer/ceilometer-alarm/start.sh

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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

 #!/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