From 160f1cc0116bf93cfceffeb0149e525ba08eed3f Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Sun, 27 Sep 2015 11:38:25 +0000 Subject: [PATCH] remove set_configs Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external --- docker/base/kolla-common.sh | 23 +++---------------- docker/ceilometer/ceilometer-alarm/start.sh | 4 ---- docker/ceilometer/ceilometer-api/start.sh | 4 ---- docker/ceilometer/ceilometer-central/start.sh | 4 ---- .../ceilometer/ceilometer-collector/start.sh | 4 ---- docker/ceilometer/ceilometer-compute/start.sh | 4 ---- .../ceilometer-notification/start.sh | 4 ---- docker/ceph/ceph-mon/start.sh | 4 ---- docker/ceph/ceph-osd/start.sh | 4 ---- docker/cinder/cinder-api/start.sh | 5 ---- docker/cinder/cinder-backup/start.sh | 5 ---- docker/cinder/cinder-scheduler/start.sh | 5 ---- docker/cinder/cinder-volume/start.sh | 5 ---- docker/designate/designate-api/start.sh | 5 +--- .../designate-backend-bind9/start.sh | 5 +--- docker/designate/designate-central/start.sh | 5 +--- docker/designate/designate-mdns/start.sh | 5 +--- .../designate/designate-poolmanager/start.sh | 5 +--- docker/designate/designate-sink/start.sh | 5 +--- docker/glance/glance-api/start.sh | 5 ---- docker/glance/glance-registry/start.sh | 5 ---- docker/gnocchi/gnocchi-api/start.sh | 3 --- docker/gnocchi/gnocchi-statsd/start.sh | 3 --- docker/haproxy/start.sh | 4 ---- docker/heat/heat-api-cfn/start.sh | 4 ---- docker/heat/heat-api/start.sh | 4 ---- docker/heat/heat-engine/start.sh | 4 ---- docker/horizon/start.sh | 5 ---- docker/keepalived/start.sh | 4 ---- docker/keystone/start.sh | 5 ---- docker/logging/rsyslog/start.sh | 3 --- docker/magnum/magnum-api/start.sh | 5 +--- docker/magnum/magnum-conductor/start.sh | 4 ---- docker/mariadb/start.sh | 8 ------- docker/memcached/start.sh | 5 ---- docker/murano/murano-api/start.sh | 4 ---- docker/murano/murano-engine/start.sh | 4 ---- .../neutron-linuxbridge-agent/start.sh | 4 ---- .../neutron-openvswitch-agent/start.sh | 4 ---- docker/neutron/neutron-server/start.sh | 4 ---- 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 ---- docker/openvswitch/ovs-db-server/start.sh | 3 --- docker/openvswitch/ovs-vswitchd/start.sh | 3 --- docker/rabbitmq/start.sh | 8 ------- docker/swift/swift-account-auditor/start.sh | 4 ---- docker/swift/swift-account-reaper/start.sh | 4 ---- .../swift/swift-account-replicator/start.sh | 4 ---- docker/swift/swift-account-server/start.sh | 4 ---- docker/swift/swift-container-auditor/start.sh | 4 ---- .../swift/swift-container-replicator/start.sh | 4 ---- docker/swift/swift-container-server/start.sh | 4 ---- docker/swift/swift-container-updater/start.sh | 4 ---- docker/swift/swift-object-auditor/start.sh | 4 ---- docker/swift/swift-object-expirer/start.sh | 4 ---- docker/swift/swift-object-replicator/start.sh | 4 ---- docker/swift/swift-object-server/start.sh | 4 ---- docker/swift/swift-object-updater/start.sh | 4 ---- docker/swift/swift-proxy-server/start.sh | 4 ---- docker/swift/swift-rsyncd/start.sh | 4 ---- docker/zaqar/start.sh | 4 ---- 67 files changed, 10 insertions(+), 303 deletions(-) diff --git a/docker/base/kolla-common.sh b/docker/base/kolla-common.sh index cc960ca24f..0cbb048211 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 ab5501b23d..d98577e08b 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 0f660e025a..6ba3cc37de 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 f2980a4d51..e074febc90 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 3a59c17d1c..585e4d7f56 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 19d90be2f9..f17a32709a 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 8ce4b44883..a3421acaff 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 3afaa3ad40..34e8647da5 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 84549ae8c3..7d24a4d1ae 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 2c6e3922fc..553158a826 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 bfa6c7878c..a083e7bacc 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 bfa6c7878c..a083e7bacc 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 bfa6c7878c..a083e7bacc 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 fe556225bb..816715fa90 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 11922974a1..bd3f8c4014 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 eac012d3d2..760f7eacd2 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 b4bcda20cd..026e8e6c3b 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 0752b9847c..a648b9b373 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 d2f93e26fc..94c70470c5 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 7ceead556a..f4463c6faf 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 6191ce8512..a083e7bacc 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 657368a27b..bb91fb831f 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 636e713238..6070a785ad 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 629c852544..3bdd4018ab 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 d43e035812..a083e7bacc 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 a0d3d6d041..b451c604c7 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 db69f85094..21a783da13 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 535f06b822..784ff5e87f 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 8c41a5f7de..1d96c3bfa5 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 91c95517cf..45c6391fc7 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 2d40de1418..fea488a622 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 ed154e29a2..dc22cd1c6f 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 a5c76ee850..b96c6324fc 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 69f40818c8..6d80153f05 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 bfa6c7878c..a083e7bacc 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 59599398e9..05bf40eecc 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 d43e035812..a083e7bacc 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 f024726483..6c4b096794 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 f024726483..6c4b096794 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 c6ae197d42..cf30a7f0a8 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 c61c37febe..6461777cae 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 6191ce8512..a083e7bacc 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 6191ce8512..a083e7bacc 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 6191ce8512..a083e7bacc 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 6191ce8512..a083e7bacc 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 2f8254b890..a083e7bacc 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 6191ce8512..a083e7bacc 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 6191ce8512..a083e7bacc 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 4d3d772cc1..60347b2dca 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 792954bb48..b72ba5a2e5 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 9e7108c3d3..1a018bc89e 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 d43e035812..a083e7bacc 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 7adad007ae..2fbfc30123 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 d43e035812..a083e7bacc 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 fa10502805..c5f1dea7ff 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