From 3327fa4fe230910ef9de60b65c70f333a27a212e Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Sat, 22 Aug 2015 16:58:26 -0700
Subject: [PATCH] Cinder reads non-Kolla generated config files

The RDO packages do something wierd about reading files from
/usr/share/cinder/cinder-dist.conf by default.  These files contain
non-Kolla configured configuration values.  This is obviously not
ideal since RDO policies may be different then Kolla policies.

This should probably be fixed across the source base, but for the
moment it is blocking correct operation of Cinder.

Change-Id: I823a90b28eaaf5474334885a45f22ed28537b24b
Closes-Bug: #1487799
---
 docker/common/cinder/cinder-api/start.sh       | 2 +-
 docker/common/cinder/cinder-backup/start.sh    | 2 +-
 docker/common/cinder/cinder-scheduler/start.sh | 2 +-
 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 ac1774b37a..6c61b3a4ec 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 748c47d91a..7d9403f076 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 9f68b61b31..759175e3f9 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 424fdfa7cf..a6874ce471 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