Merge "Keep existing data for containerized Swift"

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

diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index 843d5b2..4dd3b74 100644 (file)
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@@ -52,10 +52,6 @@ outputs:
         get_attr: [MistralApiBase, role_data, step_config]
       service_config_settings: {get_attr: [MistralApiBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
-      docker_image: &mistral_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
       puppet_config:
         config_volume: mistral
         puppet_tags: mistral_config
@@ -76,7 +72,10 @@ outputs:
         step_3:
           mistral_db_sync:
             start_order: 1
-            image: *mistral_image
+            image: &mistral_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
             net: host
             privileged: false
             detach: false
@@ -116,3 +115,7 @@ outputs:
               - /etc/localtime:/etc/localtime:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable mistral_api service
+          tags: step2
+          service: name=openstack-mistral-api state=stopped enabled=no