From c482a3d86e90d146026019bb35ca85c76f5d7f9e Mon Sep 17 00:00:00 2001
From: "Chandan Kumar (raukadah)" <chkumar@redhat.com>
Date: Thu, 24 Feb 2022 15:05:51 +0530
Subject: [PATCH] Expose [workaround]/disable_compute_service_check_for_ffu

This exposes the nova workaround to set the normal safety check
for old compute services will be treated as a warning instead
of an error.

https://review.opendev.org/c/openstack/nova/+/826097 adds
the service version check workaround for FFU.

Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
Change-Id: Ie60fceb0d51a314ede395db567a8155a773c9b15
---
 manifests/workarounds.pp                               | 10 ++++++++++
 ...compute_service_check_for_ffu-4c4cc458df3ca33b.yaml |  6 ++++++
 spec/classes/nova_workarounds_spec.rb                  |  3 +++
 3 files changed, 19 insertions(+)
 create mode 100644 releasenotes/notes/add-workarounds-disable_compute_service_check_for_ffu-4c4cc458df3ca33b.yaml

diff --git a/manifests/workarounds.pp b/manifests/workarounds.pp
index 248a6dce4..da877a944 100644
--- a/manifests/workarounds.pp
+++ b/manifests/workarounds.pp
@@ -26,6 +26,13 @@
 #   plugged events when performing hard reboot.
 #   Defaults to $::os_service_default
 #
+# [*disable_compute_service_check_for_ffu*]
+#   (Optional) If this is set, the normal safety check for old compute services will
+#   be treated as a warning instead of an error. This is only to be enabled to
+#   facilitate a Fast-Forward upgrade where new control services are being started
+#   before compute nodes have been able to update their service record.
+#   Defaults to $::os_service_default
+#
 # DEPRECATED
 #
 #  [*enable_numa_live_migration*]
@@ -37,6 +44,7 @@ class nova::workarounds (
   $ensure_libvirt_rbd_instance_dir_cleanup       = $::os_service_default,
   $enable_qemu_monitor_announce_self             = $::os_service_default,
   $wait_for_vif_plugged_event_during_hard_reboot = $::os_service_default,
+  $disable_compute_service_check_for_ffu         = $::os_service_default,
   # DEPRECATED PARAMETER
   $enable_numa_live_migration              = undef,
 ) {
@@ -57,6 +65,8 @@ class nova::workarounds (
       value => $enable_qemu_monitor_announce_self;
     'workarounds/wait_for_vif_plugged_event_during_hard_reboot':
       value => join(any2array($wait_for_vif_plugged_event_during_hard_reboot), ',');
+    'workarounds/disable_compute_service_check_for_ffu':
+      value => $disable_compute_service_check_for_ffu;
   }
 
 }
diff --git a/releasenotes/notes/add-workarounds-disable_compute_service_check_for_ffu-4c4cc458df3ca33b.yaml b/releasenotes/notes/add-workarounds-disable_compute_service_check_for_ffu-4c4cc458df3ca33b.yaml
new file mode 100644
index 000000000..6b1a22576
--- /dev/null
+++ b/releasenotes/notes/add-workarounds-disable_compute_service_check_for_ffu-4c4cc458df3ca33b.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added ``disable_compute_service_check_for_ffu`` paramter to
+    ``nova::workarounds`` to configure the configuration option with the same
+    name.
diff --git a/spec/classes/nova_workarounds_spec.rb b/spec/classes/nova_workarounds_spec.rb
index 2eff8d3dd..f35ac85ef 100644
--- a/spec/classes/nova_workarounds_spec.rb
+++ b/spec/classes/nova_workarounds_spec.rb
@@ -14,6 +14,7 @@ describe 'nova::workarounds' do
       it { is_expected.to contain_nova_config('workarounds/ensure_libvirt_rbd_instance_dir_cleanup').with_value('<SERVICE DEFAULT>') }
       it { is_expected.to contain_nova_config('workarounds/enable_qemu_monitor_announce_self').with_value('<SERVICE DEFAULT>') }
       it { is_expected.to contain_nova_config('workarounds/wait_for_vif_plugged_event_during_hard_reboot').with_value('<SERVICE DEFAULT>') }
+      it { is_expected.to contain_nova_config('workarounds/disable_compute_service_check_for_ffu').with_value('<SERVICE DEFAULT>') }
     end
 
     context 'with overridden parameters' do
@@ -24,6 +25,7 @@ describe 'nova::workarounds' do
           :ensure_libvirt_rbd_instance_dir_cleanup       => true,
           :enable_qemu_monitor_announce_self             => true,
           :wait_for_vif_plugged_event_during_hard_reboot => ['normal', 'direct'],
+          :disable_compute_service_check_for_ffu         => true,
         }
       end
 
@@ -32,6 +34,7 @@ describe 'nova::workarounds' do
       it { is_expected.to contain_nova_config('workarounds/ensure_libvirt_rbd_instance_dir_cleanup').with_value('true') }
       it { is_expected.to contain_nova_config('workarounds/enable_qemu_monitor_announce_self').with_value(true) }
       it { is_expected.to contain_nova_config('workarounds/wait_for_vif_plugged_event_during_hard_reboot').with_value('normal,direct') }
+      it { is_expected.to contain_nova_config('workarounds/disable_compute_service_check_for_ffu').with_value(true) }
     end
 
   end