From b3772a418530c659bb8a08f35e7ae0bbdb8422e0 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 7 Apr 2023 15:18:32 +0900
Subject: [PATCH] Remove support for [upgrade_levels] network

... because it was deprecated during 2023.1 cycle[1]. The actual option
was already removed from nova.

[1] feb79359eb2cda759cfdb513d03302f1b2021c77

Change-Id: I753ec109f5bd4ee230417f7412dbd50f4ab930da
---
 manifests/init.pp                                     | 11 -----------
 ...remove-upgrade_level_network-e485e6fdb0c17c30.yaml |  4 ++++
 spec/classes/nova_init_spec.rb                        |  2 --
 3 files changed, 4 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/remove-upgrade_level_network-e485e6fdb0c17c30.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index c1a4d4964..9eeeac206 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -370,10 +370,6 @@
 #  (optional) Sets a version cap for messages sent to cert services
 #  Defaults to undef
 #
-# [*upgrade_level_network*]
-#  (optional) Sets a version cap for messages sent to network services
-#  Defaults to $facts['os_service_default']
-#
 class nova(
   $ensure_package                         = 'present',
   $default_transport_url                  = $facts['os_service_default'],
@@ -453,7 +449,6 @@ class nova(
   # DEPRECATED PARAMETERS
   $auth_strategy                          = undef,
   $upgrade_level_cert                     = undef,
-  $upgrade_level_network                  = undef,
 ) inherits nova::params {
 
   include nova::deps
@@ -471,11 +466,6 @@ class nova(
 in a future release.")
   }
 
-  if $upgrade_level_network != undef {
-    warning("The upgrade_level_network parameter is deprecated and will be removed \
-in a future release.")
-  }
-
   if $use_ssl {
     if !$cert_file {
       fail('The cert_file parameter is required when use_ssl is set to true')
@@ -697,7 +687,6 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
     'upgrade_levels/compute':     value => $upgrade_level_compute;
     'upgrade_levels/conductor':   value => $upgrade_level_conductor;
     'upgrade_levels/intercell':   value => $upgrade_level_intercell;
-    'upgrade_levels/network':     value => pick($upgrade_level_network, $facts['os_service_default']);
     'upgrade_levels/scheduler':   value => $upgrade_level_scheduler;
   }
 }
diff --git a/releasenotes/notes/remove-upgrade_level_network-e485e6fdb0c17c30.yaml b/releasenotes/notes/remove-upgrade_level_network-e485e6fdb0c17c30.yaml
new file mode 100644
index 000000000..e175ebb32
--- /dev/null
+++ b/releasenotes/notes/remove-upgrade_level_network-e485e6fdb0c17c30.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``nova::upgrade_level_network`` parameter has been removed.
diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb
index 32e860d83..d962997e9 100644
--- a/spec/classes/nova_init_spec.rb
+++ b/spec/classes/nova_init_spec.rb
@@ -150,7 +150,6 @@ describe 'nova' do
           :upgrade_level_compute                   => '1.0.0',
           :upgrade_level_conductor                 => '1.0.0',
           :upgrade_level_intercell                 => '1.0.0',
-          :upgrade_level_network                   => '1.0.0',
           :upgrade_level_scheduler                 => '1.0.0',
           :purge_config                            => false,
           :my_ip                                   => '192.0.2.1',
@@ -234,7 +233,6 @@ describe 'nova' do
         is_expected.to contain_nova_config('upgrade_levels/compute').with_value('1.0.0')
         is_expected.to contain_nova_config('upgrade_levels/conductor').with_value('1.0.0')
         is_expected.to contain_nova_config('upgrade_levels/intercell').with_value('1.0.0')
-        is_expected.to contain_nova_config('upgrade_levels/network').with_value('1.0.0')
         is_expected.to contain_nova_config('upgrade_levels/scheduler').with_value('1.0.0')
       end