Skip to content
Snippets Groups Projects
Commit b8da1faf authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Cinder reads non-Kolla generated config files"

parents 2e829acd 3327fa4f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
docker/common/cinder/cinder-api/start.sh
+ 1
− 1
View file @ b8da1faf
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
set -o errexit set -o errexit
CMD="/usr/bin/cinder-api" CMD="/usr/bin/cinder-api"
ARGS="" ARGS="--config-file /etc/cinder/cinder.conf"
# Loading common functions. # Loading common functions.
source /opt/kolla/kolla-common.sh source /opt/kolla/kolla-common.sh
......
docker/common/cinder/cinder-backup/start.sh
+ 1
− 1
View file @ b8da1faf
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
set -o errexit set -o errexit
CMD="/usr/bin/cinder-backup" CMD="/usr/bin/cinder-backup"
ARGS="" ARGS="--config-file /etc/cinder/cinder.conf"
# Loading common functions. # Loading common functions.
source /opt/kolla/kolla-common.sh source /opt/kolla/kolla-common.sh
......
docker/common/cinder/cinder-scheduler/start.sh
+ 1
− 1
View file @ b8da1faf
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
set -o errexit set -o errexit
CMD="/usr/bin/cinder-scheduler" CMD="/usr/bin/cinder-scheduler"
ARGS="" ARGS="--config-file /etc/cinder/cinder.conf"
# Loading common functions. # Loading common functions.
source /opt/kolla/kolla-common.sh source /opt/kolla/kolla-common.sh
......
docker/common/cinder/cinder-volume/start.sh
+ 1
− 1
View file @ b8da1faf
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
set -o errexit set -o errexit
CMD="/usr/bin/cinder-volume" CMD="/usr/bin/cinder-volume"
ARGS="" ARGS="--config-file /etc/cinder/cinder.conf"
# Loading common functions. # Loading common functions.
source /opt/kolla/kolla-common.sh source /opt/kolla/kolla-common.sh
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment