From feb79359eb2cda759cfdb513d03302f1b2021c77 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 21 Nov 2022 14:34:37 +0900
Subject: [PATCH] Deprecate support for [upgrade_levels] network

... because the option was deprecated several cycles ago by [1].

[1] f0d2925bc71d0649f75fd3d281742f2e56e7e3b6

Change-Id: I66527f6ef2ad547621e80ea702ef65980db77b26
---
 manifests/init.pp                             | 21 ++++++++++++-------
 ...pgrade_level_network-64301c66337d1ad0.yaml |  5 +++++
 2 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-upgrade_level_network-64301c66337d1ad0.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 6727017ff..a13630037 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -303,10 +303,6 @@
 #  (optional) Sets a version cap for messages sent between cells services
 #  Defaults to $::os_service_default
 #
-# [*upgrade_level_network*]
-#  (optional) Sets a version cap for messages sent to network services
-#  Defaults to $::os_service_default
-#
 # [*upgrade_level_scheduler*]
 #  (optional) Sets a version cap for messages sent to scheduler services
 #  Defaults to $::os_service_default
@@ -384,6 +380,10 @@
 #  (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 $::os_service_default
+#
 class nova(
   $ensure_package                         = 'present',
   $default_transport_url                  = $::os_service_default,
@@ -448,7 +448,6 @@ class nova(
   $upgrade_level_compute                  = $::os_service_default,
   $upgrade_level_conductor                = $::os_service_default,
   $upgrade_level_intercell                = $::os_service_default,
-  $upgrade_level_network                  = $::os_service_default,
   $upgrade_level_scheduler                = $::os_service_default,
   $cpu_allocation_ratio                   = $::os_service_default,
   $ram_allocation_ratio                   = $::os_service_default,
@@ -465,6 +464,7 @@ class nova(
   $cinder_catalog_info                    = undef,
   $cross_az_attach                        = undef,
   $upgrade_level_cert                     = undef,
+  $upgrade_level_network                  = undef,
 ) inherits nova::params {
 
   include nova::deps
@@ -491,8 +491,13 @@ Use nova::cinder::cross_az_attach instead.')
   }
 
   if $upgrade_level_cert != undef {
-    warning('The upgrade_level_cert parameter is deprecated and will be removed \
-in a future release.')
+    warning("The upgrade_level_cert parameter is deprecated and will be removed \
+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 {
@@ -712,7 +717,7 @@ 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 => $upgrade_level_network;
+    'upgrade_levels/network':     value => pick($upgrade_level_network, $::os_service_default);
     'upgrade_levels/scheduler':   value => $upgrade_level_scheduler;
   }
 }
diff --git a/releasenotes/notes/deprecate-upgrade_level_network-64301c66337d1ad0.yaml b/releasenotes/notes/deprecate-upgrade_level_network-64301c66337d1ad0.yaml
new file mode 100644
index 000000000..7d23253ad
--- /dev/null
+++ b/releasenotes/notes/deprecate-upgrade_level_network-64301c66337d1ad0.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``[upgrade_level] upgrade_level_network`` parameter has been deprecated
+    and will be removed in a future release.