X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fnova-ironic.yaml;h=3fd71d8845bf3d83f4c9b7a2287f7a3e56b8cfd1;hb=c7471e7503a61ed6895ac6ce92ca48afd225343b;hp=9941abda35b13193b17ea36cbbeb8ede4be9e733;hpb=886d9afc793fa2a719b32270df4b2fb453a02ad7;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 9941abda..3fd71d88 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized Nova Ironic Compute service
@@ -33,6 +33,8 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
 
   NovaIronicBase:
     type: ../../puppet/services/nova-ironic.yaml
@@ -70,16 +72,18 @@ outputs:
             user: root
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /dev:/dev
-              - /etc/iscsi:/etc/iscsi
-              - /var/lib/nova/:/var/lib/nova
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
+                  - /run:/run
+                  - /dev:/dev
+                  - /etc/iscsi:/etc/iscsi
+                  - /var/lib/nova/:/var/lib/nova
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
         - name: Stop and disable nova-compute service
           tags: step2
-          service: name=nova-compute state=stopped enabled=no
+          service: name=openstack-nova-compute state=stopped enabled=no