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/cinder | |
| parent | 762b24cc1a29f6ba803ee2045d41f98d6adbed05 (diff) | |
| parent | 160f1cc0116bf93cfceffeb0149e525ba08eed3f (diff) | |
| download | kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.tar.gz kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.zip | |
Merge "remove set_configs"
Diffstat (limited to 'docker/cinder')
| -rwxr-xr-x | docker/cinder/cinder-api/start.sh | 5 | ||||
| -rwxr-xr-x | docker/cinder/cinder-backup/start.sh | 5 | ||||
| -rwxr-xr-x | docker/cinder/cinder-scheduler/start.sh | 5 | ||||
| -rwxr-xr-x | docker/cinder/cinder-volume/start.sh | 5 |
4 files changed, 0 insertions, 20 deletions
diff --git a/docker/cinder/cinder-api/start.sh b/docker/cinder/cinder-api/start.sh index 2c6e3922f..553158a82 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 bfa6c7878..a083e7bac 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 bfa6c7878..a083e7bac 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 bfa6c7878..a083e7bac 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 |