Merge "Nic config mappings for deployed-server"

[apex-tripleo-heat-templates.git] / docker / services / mistral-executor.yaml

diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index 8833154..d68830e 100644 (file)
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -53,10 +53,6 @@ outputs:
         get_attr: [MistralBase, role_data, step_config]
       service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
-      docker_image: &mistral_executor_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerMistralExecutorImage} ]
       puppet_config:
         config_volume: mistral
         puppet_tags: mistral_config
@@ -76,7 +72,10 @@ outputs:
       docker_config:
         step_4:
           mistral_executor:
-            image: *mistral_executor_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerMistralExecutorImage} ]
             net: host
             privileged: false
             restart: always
@@ -92,3 +91,7 @@ outputs:
               - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable mistral_executor service
+          tags: step2
+          service: name=openstack-mistral-executor state=stopped enabled=no