openstack/kolla-ansible
Code Issues Proposed changes

Merge "Cinder reads non-Kolla generated config files"

Browse Source
This commit is contained in:
Jenkins
2015-08-24 12:32:33 +00:00
committed by Gerrit Code Review
parent 2e829acda4 3327fa4fe2
commit b8da1faf4f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/common/cinder/cinder-api/start.sh
View File

@@ -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

2
docker/common/cinder/cinder-backup/start.sh
View File

@@ -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

2
docker/common/cinder/cinder-scheduler/start.sh
View File

@@ -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

2
docker/common/cinder/cinder-volume/start.sh
View File

@@ -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