Merge "Add missing undercloud upgrade tasks"

docker/services/mistral-api.yaml

@@ -36,6 +36,10 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  UndercloudUpgrade:
+    type: boolean
+    description: Flag to indicate undercloud upgrade process is being run.
+    default: false
 
 resources:
 
@@ -160,6 +164,12 @@ outputs:
               Log files from mistral containers can be found under
               /var/log/containers/mistral.
           ignore_errors: true
+        - name: Stop and disable the mistral-api service
+          service:
+            name: openstack-mistral-api
+            state: stopped
+            enabled: no
+          when: {get_param: UndercloudUpgrade}
       upgrade_tasks:
         - name: Check if mistral api is deployed
           command: systemctl is-enabled --quiet openstack-mistral-api

docker/services/nova-api.yaml

@@ -325,6 +325,12 @@ outputs:
                 path: /var/spool/cron/nova
                 state: absent
               when: {get_param: UndercloudUpgrade}
+            - name: Stop and disable the nova-api service
+              service:
+                name: openstack-nova-api
+                state: stopped
+                enabled: no
+              when: {get_param: UndercloudUpgrade}
       upgrade_tasks:
         - name: Check if nova_api is deployed
           command: systemctl is-enabled --quiet openstack-nova-api