openstack/kolla-ansible
Code Issues Proposed changes

All the Cinder services need to reference the correct config

Browse Source 
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
This commit is contained in:
rthallisey 2015-08-12 15:22:01 -04:00 committed by Ryan Hallisey
parent b36abefd8f
commit 759cc41647
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/cinder/tasks/start.yml
View File

@ -12,7 +12,7 @@
insecure_registry: "{{ docker_insecure_registry }}" insecure_registry: "{{ docker_insecure_registry }}"
name: cinder_api name: cinder_api
image: "{{ cinder_api_image_full }}" 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: env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['cinder-api'] when: inventory_hostname in groups['cinder-api']

2
docker/common/cinder/cinder-api/config-external.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
SOURCE="/opt/kolla/cinder/cinder.conf" SOURCE="/opt/kolla/cinder-api/cinder.conf"
TARGET="/etc/cinder/cinder.conf" TARGET="/etc/cinder/cinder.conf"
OWNER="cinder" OWNER="cinder"

2
docker/common/cinder/cinder-backup/config-external.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
SOURCE="/opt/kolla/cinder/cinder.conf" SOURCE="/opt/kolla/cinder-backup/cinder.conf"
TARGET="/etc/cinder/cinder.conf" TARGET="/etc/cinder/cinder.conf"
OWNER="cinder" OWNER="cinder"

2
docker/common/cinder/cinder-scheduler/config-external.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
SOURCE="/opt/kolla/cinder/cinder.conf" SOURCE="/opt/kolla/cinder-scheduler/cinder.conf"
TARGET="/etc/cinder/cinder.conf" TARGET="/etc/cinder/cinder.conf"
OWNER="cinder" OWNER="cinder"

2
docker/common/cinder/cinder-volume/config-external.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
SOURCE="/opt/kolla/cinder/cinder.conf" SOURCE="/opt/kolla/cinder-volume/cinder.conf"
TARGET="/etc/cinder/cinder.conf" TARGET="/etc/cinder/cinder.conf"
OWNER="cinder" OWNER="cinder"