aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/multipathd.yaml
diff options
context:
space:
mode:
authorOliver Walsh <owalsh@redhat.com>2017-07-10 15:51:20 +0100
committerOliver Walsh <owalsh@redhat.com>2017-07-17 13:56:15 +0100
commit8e5bb308cf0832c1ea3d8aa315542cbfa882b310 (patch)
tree9c97878f76013c6fb83c74de78c2e126b40d4885 /docker/services/multipathd.yaml
parent1bb56bce55845ddf0c2a0d330c46b0fd03f9036c (diff)
Refactor iscsi initiator-name reset into separate service
This currently assumes nova-compute and iscsid run in the same context which isn't true for a containerized deployment Change-Id: I11232fc412adcc18087928c281ba82546388376e Depends-On: I91f1ce7625c351745dbadd84b565d55598ea5b59 Depends-On: I0cbb1081ad00b2202c9d913e0e1759c2b95612a5
Diffstat (limited to 'docker/services/multipathd.yaml')
-rw-r--r--docker/services/multipathd.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml
index 51b93029..a0c02f30 100644
--- a/docker/services/multipathd.yaml
+++ b/docker/services/multipathd.yaml
@@ -59,6 +59,11 @@ outputs:
kolla_config:
/var/lib/kolla/config_files/multipathd.json:
command: /usr/sbin/multipathd -d
+ config_files:
+ - source: "/var/lib/kolla/config_files/src-iscsid/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
docker_config:
step_3:
multipathd:
@@ -72,11 +77,11 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
- /dev/:/dev/
- /run/:/run/
- /sys:/sys
- /lib/modules:/lib/modules:ro
- - /etc/iscsi:/etc/iscsi
- /var/lib/cinder:/var/lib/cinder
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS