X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fmistral-executor.yaml;h=9c3bfb337bc748c4659f0744fdef122634dc8de8;hb=9697f70dcbbb30882bf8cb90f9dd0bcfc35f087f;hp=d68830edd70306d45659edc24eb4210d317bf073;hpb=76e34cfa2b252f314a06c27d75cfe2bc997206c2;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index d68830ed..9c3bfb33 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized Mistral Executor service
@@ -34,6 +34,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   MistralBase:
     type: ../../puppet/services/mistral-executor.yaml
     properties:
@@ -62,13 +65,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerMistralConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/mistral_executor.json:
-           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/executor.log --server=executor
-           config_files:
-           - dest: /etc/mistral/mistral.conf
-             owner: mistral
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/mistral/mistral.conf
+        /var/lib/kolla/config_files/mistral_executor.json:
+          command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/executor.log --server=executor
       docker_config:
         step_4:
           mistral_executor:
@@ -80,15 +78,16 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /run:/run
-              - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/mistral/:/var/lib/kolla/config_files/src:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              # FIXME: this is required in order for Nova cells
-              # initialization workflows on the Undercloud. Need to
-              # exclude this on the overcloud for security reasons.
-              - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
+                  - /run:/run
+                  # FIXME: this is required in order for Nova cells
+                  # initialization workflows on the Undercloud. Need to
+                  # exclude this on the overcloud for security reasons.
+                  - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks: