diff options
| author | rthallisey <rhallise@redhat.com> | 2015-08-12 15:22:01 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-08-13 16:26:35 -0400 |
| commit | 759cc41647072061574eccd2dcaaa88c168620c2 (patch) | |
| tree | d8107e5bbde3e8f778c5e5e2c6d914b38f9a0fb0 | |
| parent | b36abefd8f5e92c7792c7a8eb12f012f9f45e160 (diff) | |
| download | kolla-759cc41647072061574eccd2dcaaa88c168620c2.tar.gz kolla-759cc41647072061574eccd2dcaaa88c168620c2.zip | |
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
5 files changed, 5 insertions, 5 deletions
diff --git a/ansible/roles/cinder/tasks/start.yml b/ansible/roles/cinder/tasks/start.yml index 613974381..1f54d7cb0 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 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" |