diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-24 12:32:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-24 12:32:33 +0000 |
| commit | b8da1faf4f3a6599e406896951aacd15c1ca3978 (patch) | |
| tree | 361610809ad2b3d8b61f0ddde319f9ff04236f9d /docker | |
| parent | 2e829acda41067a85f1beb226dc693bead706a4e (diff) | |
| parent | 3327fa4fe230910ef9de60b65c70f333a27a212e (diff) | |
| download | kolla-b8da1faf4f3a6599e406896951aacd15c1ca3978.tar.gz kolla-b8da1faf4f3a6599e406896951aacd15c1ca3978.zip | |
Merge "Cinder reads non-Kolla generated config files"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/common/cinder/cinder-api/start.sh | 2 | ||||
| -rwxr-xr-x | docker/common/cinder/cinder-backup/start.sh | 2 | ||||
| -rwxr-xr-x | docker/common/cinder/cinder-scheduler/start.sh | 2 | ||||
| -rwxr-xr-x | docker/common/cinder/cinder-volume/start.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/common/cinder/cinder-api/start.sh b/docker/common/cinder/cinder-api/start.sh index ac1774b37..6c61b3a4e 100755 --- a/docker/common/cinder/cinder-api/start.sh +++ b/docker/common/cinder/cinder-api/start.sh @@ -3,7 +3,7 @@ set -o errexit CMD="/usr/bin/cinder-api" -ARGS="" +ARGS="--config-file /etc/cinder/cinder.conf" # Loading common functions. source /opt/kolla/kolla-common.sh diff --git a/docker/common/cinder/cinder-backup/start.sh b/docker/common/cinder/cinder-backup/start.sh index 748c47d91..7d9403f07 100755 --- a/docker/common/cinder/cinder-backup/start.sh +++ b/docker/common/cinder/cinder-backup/start.sh @@ -3,7 +3,7 @@ set -o errexit CMD="/usr/bin/cinder-backup" -ARGS="" +ARGS="--config-file /etc/cinder/cinder.conf" # Loading common functions. source /opt/kolla/kolla-common.sh diff --git a/docker/common/cinder/cinder-scheduler/start.sh b/docker/common/cinder/cinder-scheduler/start.sh index 9f68b61b3..759175e3f 100755 --- a/docker/common/cinder/cinder-scheduler/start.sh +++ b/docker/common/cinder/cinder-scheduler/start.sh @@ -3,7 +3,7 @@ set -o errexit CMD="/usr/bin/cinder-scheduler" -ARGS="" +ARGS="--config-file /etc/cinder/cinder.conf" # Loading common functions. source /opt/kolla/kolla-common.sh diff --git a/docker/common/cinder/cinder-volume/start.sh b/docker/common/cinder/cinder-volume/start.sh index 424fdfa7c..a6874ce47 100755 --- a/docker/common/cinder/cinder-volume/start.sh +++ b/docker/common/cinder/cinder-volume/start.sh @@ -3,7 +3,7 @@ set -o errexit CMD="/usr/bin/cinder-volume" -ARGS="" +ARGS="--config-file /etc/cinder/cinder.conf" # Loading common functions. source /opt/kolla/kolla-common.sh |