summaryrefslogtreecommitdiffstats
path: root/docker/services/nova-ironic.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-24 04:36:35 +0000
committerGerrit Code Review <review@openstack.org>2017-07-24 04:36:35 +0000
commit84e6bff8a62539b381c5706fab7b8ea90f00f0dd (patch)
tree59e3b81a631e215f59cfa0499e7fb12715c26ed6 /docker/services/nova-ironic.yaml
parent32c40b97962ce42346b8e335bc342a618c0baded (diff)
parent8e5bb308cf0832c1ea3d8aa315542cbfa882b310 (diff)
Merge "Refactor iscsi initiator-name reset into separate service"
Diffstat (limited to 'docker/services/nova-ironic.yaml')
-rw-r--r--docker/services/nova-ironic.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 89ef95ea..17068b41 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -73,6 +73,10 @@ outputs:
dest: "/"
merge: true
preserve_properties: true
+ - source: "/var/lib/kolla/config_files/src-iscsid/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/log/nova
owner: nova:nova
@@ -94,9 +98,9 @@ outputs:
-
- /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+ - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
- /run:/run
- /dev:/dev
- - /etc/iscsi:/etc/iscsi
- /var/lib/nova/:/var/lib/nova
- /var/log/containers/nova:/var/log/nova
environment: