Merge "Add inflight validations for compute services"

deployment/nova/nova-api-container-puppet.yaml

@@ -429,6 +429,13 @@ outputs:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
+      deploy_steps_tasks:
+        - name: validate nova api container state
+          when: step|int == 5
+          tags:
+            - opendev-validation
+            - opendev-validation-nova
+          command: "{{ container_cli }} exec nova_api /openstack/healthcheck"
       host_prep_tasks: {get_attr: [NovaApiLogging, host_prep_tasks]}
       upgrade_tasks:
         - when: step|int == 0

deployment/nova/nova-compute-container-puppet.yaml

@@ -928,7 +928,19 @@ outputs:
               with_items:
                 - ksm.service
                 - ksmtuned.service
-      deploy_steps_tasks: {get_attr: [NovaComputeCommon, nova_compute_common_deploy_steps_tasks]}
+      deploy_steps_tasks:
+        list_concat:
+        - {get_attr: [NovaComputeCommon, nova_compute_common_deploy_steps_tasks]}
+        - - name: validate nova compute container state
+            when: step|int == 5
+            tags:
+              - opendev-validation
+              - opendev-validation-nova
+            command:
+              str_replace:
+                template: "{{ container_cli }} exec nova_compute HEALTHCHECK"
+                params:
+                  HEALTHCHECK: {get_attr: [ContainersCommon, healthcheck_rpc_port, test]}
       upgrade_tasks:
         - name: Remove openstack-nova-compute and python-nova package during upgrade
           package:

deployment/nova/nova-conductor-container-puppet.yaml

@@ -191,6 +191,17 @@ outputs:
                   - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      deploy_steps_tasks:
+        - name: validate nova conductor container state
+          when: step|int == 5
+          tags:
+            - opendev-validation
+            - opendev-validation-nova
+          command:
+            str_replace:
+              template: "{{ container_cli }} exec nova_conductor HEALTHCHECK"
+              params:
+                HEALTHCHECK: {get_attr: [ContainersCommon, healthcheck_rpc_port, test]}
       host_prep_tasks:
         list_concat:
           - {get_attr: [NovaLogging, host_prep_tasks]}

deployment/nova/nova-libvirt-container-puppet.yaml

@@ -781,6 +781,13 @@ outputs:
                         SECRET_UUID: {get_param: CephClusterFSID}
                         SECRET_KEY: {get_param: CephClientKey}
             - {}
+      deploy_steps_tasks:
+        - name: validate nova-libvirt container state
+          when: step|int == 4
+          tags:
+            - opendev-validation
+            - opendev-validation-nova
+          command: "{{ container_cli }} exec nova_libvirt /openstack/healthcheck"
       host_prep_tasks:
         - name: create libvirt persistent data directories
           file:

deployment/nova/nova-metadata-container-puppet.yaml

@@ -234,6 +234,13 @@ outputs:
                       - ''
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      deploy_steps_tasks:
+        - name: validate nova metadata container state
+          when: step|int == 5
+          tags:
+            - opendev-validation
+            - opendev-validation-nova
+          command: "{{ container_cli }} exec nova_metadata /openstack/healthcheck"
       host_prep_tasks: {get_attr: [NovaMetadataLogging, host_prep_tasks]}
       external_upgrade_tasks:
         - when:

deployment/nova/nova-migration-target-container-puppet.yaml

@@ -171,6 +171,13 @@ outputs:
                   - - /var/lib/nova:/var/lib/nova:shared,z
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      deploy_steps_tasks:
+        - name: validate nova migration target container state
+          when: step|int == 5
+          tags:
+            - opendev-validation
+            - opendev-validation-nova
+          command: "{{ container_cli }} exec nova_migration_target /openstack/healthcheck"
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/nova/nova-scheduler-container-puppet.yaml

@@ -188,6 +188,17 @@ outputs:
                   - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      deploy_steps_tasks:
+        - name: validate nova scheduler container state
+          when: step|int == 5
+          tags:
+            - opendev-validation
+            - opendev-validation-nova
+          command:
+            str_replace:
+              template: "{{ container_cli }} exec nova_scheduler HEALTHCHECK"
+              params:
+                HEALTHCHECK: {get_attr: [ContainersCommon, healthcheck_rpc_port, test]}
       host_prep_tasks:
         list_concat:
           - {get_attr: [NovaLogging, host_prep_tasks]}

deployment/nova/nova-vnc-proxy-container-puppet.yaml

@@ -284,6 +284,13 @@ outputs:
               network: {get_param: [ServiceNetMap, NovaApiNetwork]}
               type: node
           - null
+      deploy_steps_tasks:
+        - name: validate nova-vnc-proxy container state
+          when: step|int == 5
+          tags:
+            - opendev-validation
+            - opendev-validation-nova
+          command: "{{ container_cli }} exec nova_vnc_proxy /openstack/healthcheck"
       host_prep_tasks: {get_attr: [NovaLogging, host_prep_tasks]}
       fast_forward_upgrade_tasks:
         - when: