From 759cc41647072061574eccd2dcaaa88c168620c2 Mon Sep 17 00:00:00 2001
From: rthallisey <rhallise@redhat.com>
Date: Wed, 12 Aug 2015 15:22:01 -0400
Subject: [PATCH] All the Cinder services need to reference the correct config

Every service except cinder-api was looking for the file
'/opt/kolla/cinder/cinder-<service>.conf' when the config file in place was named
'cinder.conf'.  Change the rest of the services to look for cinder.conf or
the config file will never be copied over to into '/etc/cinder/'.

Change-Id: I1cd59f1da09e6f3bc7e7b3a4f45f9da2b8247479
Closes-Bug: #1481928
Closes-Bug: #1484248
---
 ansible/roles/cinder/tasks/start.yml                     | 2 +-
 docker/common/cinder/cinder-api/config-external.sh       | 2 +-
 docker/common/cinder/cinder-backup/config-external.sh    | 2 +-
 docker/common/cinder/cinder-scheduler/config-external.sh | 2 +-
 docker/common/cinder/cinder-volume/config-external.sh    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/cinder/tasks/start.yml b/ansible/roles/cinder/tasks/start.yml
index 613974381d..1f54d7cb05 100644
--- a/ansible/roles/cinder/tasks/start.yml
+++ b/ansible/roles/cinder/tasks/start.yml
@@ -12,7 +12,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: cinder_api
     image: "{{ cinder_api_image_full }}"
-    volumes: "{{ node_config_directory }}/cinder-api/:/opt/kolla/cinder/:ro"
+    volumes: "{{ node_config_directory }}/cinder-api/:/opt/kolla/cinder-api/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['cinder-api']
diff --git a/docker/common/cinder/cinder-api/config-external.sh b/docker/common/cinder/cinder-api/config-external.sh
index 5f57ab939a..08d8cde0a2 100644
--- a/docker/common/cinder/cinder-api/config-external.sh
+++ b/docker/common/cinder/cinder-api/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/cinder/cinder.conf"
+SOURCE="/opt/kolla/cinder-api/cinder.conf"
 TARGET="/etc/cinder/cinder.conf"
 OWNER="cinder"
 
diff --git a/docker/common/cinder/cinder-backup/config-external.sh b/docker/common/cinder/cinder-backup/config-external.sh
index 5f57ab939a..ff4752492b 100644
--- a/docker/common/cinder/cinder-backup/config-external.sh
+++ b/docker/common/cinder/cinder-backup/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/cinder/cinder.conf"
+SOURCE="/opt/kolla/cinder-backup/cinder.conf"
 TARGET="/etc/cinder/cinder.conf"
 OWNER="cinder"
 
diff --git a/docker/common/cinder/cinder-scheduler/config-external.sh b/docker/common/cinder/cinder-scheduler/config-external.sh
index 5f57ab939a..3c8ca26be1 100644
--- a/docker/common/cinder/cinder-scheduler/config-external.sh
+++ b/docker/common/cinder/cinder-scheduler/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/cinder/cinder.conf"
+SOURCE="/opt/kolla/cinder-scheduler/cinder.conf"
 TARGET="/etc/cinder/cinder.conf"
 OWNER="cinder"
 
diff --git a/docker/common/cinder/cinder-volume/config-external.sh b/docker/common/cinder/cinder-volume/config-external.sh
index 5f57ab939a..2f6b99fc9c 100755
--- a/docker/common/cinder/cinder-volume/config-external.sh
+++ b/docker/common/cinder/cinder-volume/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE="/opt/kolla/cinder/cinder.conf"
+SOURCE="/opt/kolla/cinder-volume/cinder.conf"
 TARGET="/etc/cinder/cinder.conf"
 OWNER="cinder"