aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/nova-ironic.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/nova-ironic.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/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 89ef95e..17068b4 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: