Merge "Added NovaDisableComputeServiceCheckForFfu var" into stable/wallaby

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

@@ -648,6 +648,12 @@ parameters:
     default: false
     tags:
       - role_specific
+  NovaDisableComputeServiceCheckForFfu:
+    type: boolean
+    description: >
+      Facilitate a Fast-Forward upgrade where new control services are being started
+      before compute nodes have been able to update their service record.
+    default: false
   NovaStatedirOwnershipSkip:
     type: comma_delimited_list
     description: >
@@ -1179,6 +1185,8 @@ outputs:
               if:
                 - nova_libvirt_max_queues_set
                 - {get_attr: [RoleParametersValue, value, nova_libvirt_max_queues]}
+            # Params to enable service check on FFU
+            nova::workarounds::disable_compute_service_check_for_ffu: {get_param: NovaDisableComputeServiceCheckForFfu}
           - if:
             - glance_enable_rbd_download_set
             - nova::glance::enable_rbd_download: {get_attr: [RoleParametersValue, value, nova_glance_enable_rbd_download]}

releasenotes/notes/releasenotes/notes/support-for-disable_compute_service_check_for_ffu-19a91d20e146056c.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added ``NovaDisableComputeServiceCheckForFfu`` parameter to configure
+    ``nova::workarounds::disable_compute_service_check_for_ffu`` to
+    disable the service version check workaround for FFU.