diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 10:34:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 10:34:58 +0000 |
| commit | aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30 (patch) | |
| tree | a131cd99311e41a6656773095e8bf02561a6b856 /docker/magnum | |
| parent | 762b24cc1a29f6ba803ee2045d41f98d6adbed05 (diff) | |
| parent | 160f1cc0116bf93cfceffeb0149e525ba08eed3f (diff) | |
| download | kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.tar.gz kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.zip | |
Merge "remove set_configs"
Diffstat (limited to 'docker/magnum')
| -rwxr-xr-x | docker/magnum/magnum-api/start.sh | 5 | ||||
| -rwxr-xr-x | docker/magnum/magnum-conductor/start.sh | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/docker/magnum/magnum-api/start.sh b/docker/magnum/magnum-api/start.sh index ed154e29a..dc22cd1c6 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 a5c76ee85..b96c6324f 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 |