X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fmistral-executor.yaml;h=45fed7b2c8f36a8a35a9cecfaa798d3c920d0424;hb=f68111bd9ecaa149b9fc62cdf15fc7d9a9c41737;hp=0274ff485141cb74a0db8a20b4dac3052d01f6df;hpb=f6ea8c731a7f66b77fc0b0da8311918fb4e3c43d;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index 0274ff48..45fed7b2 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -62,17 +62,12 @@ 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:
-            image: &mistral_executor_image
+            image:
               list_join:
                 - '/'
                 - [ {get_param: DockerNamespace}, {get_param: DockerMistralExecutorImage} ]
@@ -80,11 +75,11 @@ 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
+              - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime: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.