From 8eb351d588539c20caf768c2633832a924f40690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Tue, 9 Jan 2018 10:46:36 +0100 Subject: [PATCH] Fix path for iscsi config file We changed the bind mount to be /etc/iscsi in I838427ccae06cfe1be72939c4bcc2978f7dc36a8, we need to copy the files to /etc/iscsi so that they do not end up at '/' in the container. Change-Id: Id5c1f16d08ffd36a35a6669d64460a7b2240d401 Closes-Bug: #1741850 --- docker/services/cinder-backup.yaml | 2 +- docker/services/cinder-volume.yaml | 2 +- docker/services/iscsid.yaml | 2 +- docker/services/multipathd.yaml | 2 +- docker/services/nova-compute.yaml | 2 +- docker/services/nova-ironic.yaml | 2 +- docker/services/pacemaker/cinder-backup.yaml | 2 +- docker/services/pacemaker/cinder-volume.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml index f7fa9b8ad4..e667e340b9 100644 --- a/docker/services/cinder-backup.yaml +++ b/docker/services/cinder-backup.yaml @@ -94,7 +94,7 @@ outputs: merge: true preserve_properties: true - source: "/var/lib/kolla/config_files/src-iscsid/*" - dest: "/" + dest: "/etc/iscsi/" merge: true preserve_properties: true permissions: diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 49979b80d9..6e78b69069 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -107,7 +107,7 @@ outputs: merge: true preserve_properties: true - source: "/var/lib/kolla/config_files/src-iscsid/*" - dest: "/" + dest: "/etc/iscsi/" merge: true preserve_properties: true permissions: diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml index a629f724db..dd534a139f 100644 --- a/docker/services/iscsid.yaml +++ b/docker/services/iscsid.yaml @@ -79,7 +79,7 @@ outputs: command: /usr/sbin/iscsid -f config_files: - source: "/var/lib/kolla/config_files/src-iscsid/*" - dest: "/" + dest: "/etc/iscsi/" merge: true preserve_properties: true docker_config: diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml index 16eb4061ad..200be18f44 100644 --- a/docker/services/multipathd.yaml +++ b/docker/services/multipathd.yaml @@ -60,7 +60,7 @@ outputs: command: /usr/sbin/multipathd -d config_files: - source: "/var/lib/kolla/config_files/src-iscsid/*" - dest: "/" + dest: "/etc/iscsi/" merge: true preserve_properties: true docker_config: diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index bc7c161719..adc21b47e9 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -119,7 +119,7 @@ outputs: merge: true preserve_properties: true - source: "/var/lib/kolla/config_files/src-iscsid/*" - dest: "/" + dest: "/etc/iscsi/" merge: true preserve_properties: true - source: "/var/lib/kolla/config_files/src-ceph/" diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index f369ea69b9..4843c0f8fe 100644 --- a/docker/services/nova-ironic.yaml +++ b/docker/services/nova-ironic.yaml @@ -81,7 +81,7 @@ outputs: merge: true preserve_properties: true - source: "/var/lib/kolla/config_files/src-iscsid/*" - dest: "/" + dest: "/etc/iscsi/" merge: true preserve_properties: true permissions: diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml index c0ece3d577..fd5e49c55c 100644 --- a/docker/services/pacemaker/cinder-backup.yaml +++ b/docker/services/pacemaker/cinder-backup.yaml @@ -117,7 +117,7 @@ outputs: merge: true preserve_properties: true - source: "/var/lib/kolla/config_files/src-iscsid/*" - dest: "/" + dest: "/etc/iscsi/" merge: true preserve_properties: true permissions: diff --git a/docker/services/pacemaker/cinder-volume.yaml b/docker/services/pacemaker/cinder-volume.yaml index 6aab896adc..6299967547 100644 --- a/docker/services/pacemaker/cinder-volume.yaml +++ b/docker/services/pacemaker/cinder-volume.yaml @@ -114,7 +114,7 @@ outputs: merge: true preserve_properties: true - source: "/var/lib/kolla/config_files/src-iscsid/*" - dest: "/" + dest: "/etc/iscsi/" merge: true preserve_properties: true permissions: