Merge "scenario001/pingtest: enable Gnocchi resource again"

[apex-tripleo-heat-templates.git] / docker / services / nova-ironic.yaml

diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 9941abd..2f4da6c 100644 (file)
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -33,6 +33,8 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
 
   NovaIronicBase:
     type: ../../puppet/services/nova-ironic.yaml
@@ -70,16 +72,20 @@ 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
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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