From 759cc41647072061574eccd2dcaaa88c168620c2 Mon Sep 17 00:00:00 2001 From: rthallisey Date: Wed, 12 Aug 2015 15:22:01 -0400 Subject: All the Cinder services need to reference the correct config Every service except cinder-api was looking for the file '/opt/kolla/cinder/cinder-.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 --- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/common/cinder/cinder-api/config-external.sh b/docker/common/cinder/cinder-api/config-external.sh index 5f57ab939..08d8cde0a 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 5f57ab939..ff4752492 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 5f57ab939..3c8ca26be 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 5f57ab939..2f6b99fc9 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" -- cgit v1.2.3