diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-24 04:36:35 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-24 04:36:35 +0000 |
commit | 84e6bff8a62539b381c5706fab7b8ea90f00f0dd (patch) | |
tree | 59e3b81a631e215f59cfa0499e7fb12715c26ed6 /docker/services/multipathd.yaml | |
parent | 32c40b97962ce42346b8e335bc342a618c0baded (diff) | |
parent | 8e5bb308cf0832c1ea3d8aa315542cbfa882b310 (diff) |
Merge "Refactor iscsi initiator-name reset into separate service"
Diffstat (limited to 'docker/services/multipathd.yaml')
-rw-r--r-- | docker/services/multipathd.yaml | 7 |
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 |