diff options
| author | Ryan Hallisey <rhallise@redhat.com> | 2015-09-17 14:58:02 -0400 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-24 08:12:56 +0000 |
| commit | 57017b0acd0a55cc32c697beba54b6d3e4e37c4d (patch) | |
| tree | d4f8cbf56268f8db72b3ccd7ec044f9e8f4aa937 /docker/cinder | |
| parent | 2c23f2d445fb6208b2fe1423845efd29b8e0408d (diff) | |
| download | kolla-57017b0acd0a55cc32c697beba54b6d3e4e37c4d.tar.gz kolla-57017b0acd0a55cc32c697beba54b6d3e4e37c4d.zip | |
Replace config-external with a JSON file for Cinder
Partially-Implements: blueprint replace-config-external
Change-Id: Ic247433290b51c9fb613d90e4a9a0f3d11526b35
Diffstat (limited to 'docker/cinder')
| -rwxr-xr-x | docker/cinder/cinder-api/start.sh | 10 | ||||
| -rwxr-xr-x | docker/cinder/cinder-backup/start.sh | 10 | ||||
| -rwxr-xr-x | docker/cinder/cinder-scheduler/start.sh | 10 | ||||
| -rwxr-xr-x | docker/cinder/cinder-volume/start.sh | 10 |
4 files changed, 16 insertions, 24 deletions
diff --git a/docker/cinder/cinder-api/start.sh b/docker/cinder/cinder-api/start.sh index 6c61b3a4e..2c6e3922f 100755 --- a/docker/cinder/cinder-api/start.sh +++ b/docker/cinder/cinder-api/start.sh @@ -2,14 +2,12 @@ set -o errexit -CMD="/usr/bin/cinder-api" -ARGS="--config-file /etc/cinder/cinder.conf" - # 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) # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. @@ -18,4 +16,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -exec $CMD $ARGS +exec $CMD diff --git a/docker/cinder/cinder-backup/start.sh b/docker/cinder/cinder-backup/start.sh index 7d9403f07..bfa6c7878 100755 --- a/docker/cinder/cinder-backup/start.sh +++ b/docker/cinder/cinder-backup/start.sh @@ -2,13 +2,11 @@ set -o errexit -CMD="/usr/bin/cinder-backup" -ARGS="--config-file /etc/cinder/cinder.conf" - # 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) -exec $CMD $ARGS +exec $CMD diff --git a/docker/cinder/cinder-scheduler/start.sh b/docker/cinder/cinder-scheduler/start.sh index 759175e3f..bfa6c7878 100755 --- a/docker/cinder/cinder-scheduler/start.sh +++ b/docker/cinder/cinder-scheduler/start.sh @@ -2,13 +2,11 @@ set -o errexit -CMD="/usr/bin/cinder-scheduler" -ARGS="--config-file /etc/cinder/cinder.conf" - # 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) -exec $CMD $ARGS +exec $CMD diff --git a/docker/cinder/cinder-volume/start.sh b/docker/cinder/cinder-volume/start.sh index a6874ce47..bfa6c7878 100755 --- a/docker/cinder/cinder-volume/start.sh +++ b/docker/cinder/cinder-volume/start.sh @@ -2,13 +2,11 @@ set -o errexit -CMD="/usr/bin/cinder-volume" -ARGS="--config-file /etc/cinder/cinder.conf" - # 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) -exec $CMD $ARGS +exec $CMD |