aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/cinder/tasks/start.yml2
-rw-r--r--docker/common/cinder/cinder-api/config-external.sh2
-rw-r--r--docker/common/cinder/cinder-backup/config-external.sh2
-rw-r--r--docker/common/cinder/cinder-scheduler/config-external.sh2
-rwxr-xr-xdocker/common/cinder/cinder-volume/config-external.sh2
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"