Merge "Cinder reads non-Kolla generated config files"

2015-08-24 12:32:33 +00:00
parent 2e829acda4 3327fa4fe2
commit b8da1faf4f
4 changed files with 4 additions and 4 deletions
--- 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
--- 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
--- 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
--- 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