Merge "Move Nova Compute undercloud upgrade logic into nova-ironic"

docker/services/nova-compute.yaml

@@ -73,10 +73,6 @@ parameters:
     default: []
     description: list of optional en
     type: comma_delimited_list
-  UndercloudUpgrade:
-    type: boolean
-    description: Flag to indicate undercloud upgrade process is being run.
-    default: false
 
 resources:
 
@@ -207,12 +203,6 @@ outputs:
             file:
               path: /etc/ceph
               state: directory
-          - name: Stop and disable the nova-compute service
-            service:
-              name: openstack-nova-compute
-              state: stopped
-              enabled: no
-            when: {get_param: UndercloudUpgrade}
       upgrade_tasks:
         - name: Check if nova_compute is deployed
           command: systemctl is-enabled --quiet openstack-nova-compute

docker/services/nova-ironic.yaml

@@ -36,6 +36,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  UndercloudUpgrade:
+    type: boolean
+    description: Flag to indicate undercloud upgrade process is being run.
+    default: false
 
 resources:
 
@@ -130,6 +134,12 @@ outputs:
               Log files from nova containers can be found under
               /var/log/containers/nova and /var/log/containers/httpd/nova-*.
           ignore_errors: true
+        - name: Stop and disable the nova-compute service
+          service:
+            name: openstack-nova-compute
+            state: stopped
+            enabled: no
+          when: {get_param: UndercloudUpgrade}
       upgrade_tasks:
         - name: Check if nova ironic is deployed
           command: systemctl is-enabled --quiet openstack-nova-compute