diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-23 19:16:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-23 19:16:10 +0000 |
| commit | 6e94b97dd6f0f1639c2efd167bcd028658568553 (patch) | |
| tree | 9623306e5ab502561b3b740bf78812605958c9e0 /docker | |
| parent | 9963f0a1ef115cb3b7c103e3dccb7755b79f3168 (diff) | |
| parent | a0bffb25810a634af5a7fde2d0cbb205813249de (diff) | |
| download | kolla-6e94b97dd6f0f1639c2efd167bcd028658568553.tar.gz kolla-6e94b97dd6f0f1639c2efd167bcd028658568553.zip | |
Merge "Replace config-external with a JSON file for Rabbitmq"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/rabbitmq/start.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docker/rabbitmq/start.sh b/docker/rabbitmq/start.sh index 749bee963..9e7108c3d 100755 --- a/docker/rabbitmq/start.sh +++ b/docker/rabbitmq/start.sh @@ -2,14 +2,12 @@ set -o errexit -CMD="/usr/sbin/rabbitmq-server" -ARGS="" - # loading common functions source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs +# Generate run command +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) # loading functions source /opt/kolla/config-rabbit.sh @@ -20,4 +18,5 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -$CMD $ARGS +echo "Running command: ${CMD}" +exec $CMD |