From c222bb0aa758747e360b88be0ce524a4d80be7f6 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 19 Aug 2021 09:45:23 +0900
Subject: [PATCH] Remove nova-network parameters left

... because these were already deprecated by [1] during Train cycle.

[1] 5a633e8c60413d68f1c4f831e78ea48068115dec

Change-Id: I3187f4561f9aae31b04a1858ef912dc25fce0fcb
---
 manifests/compute.pp                          | 19 -------------------
 ...install-bridge-utils-2043526f3cb40ad1.yaml |  8 ++++++++
 2 files changed, 8 insertions(+), 19 deletions(-)
 create mode 100644 releasenotes/notes/remove-install-bridge-utils-2043526f3cb40ad1.yaml

diff --git a/manifests/compute.pp b/manifests/compute.pp
index ed667cc0e..c1a0c66c8 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -256,15 +256,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*neutron_enabled*]
-#   (optional) Whether to use Neutron for networking of VMs
-#   Defaults to undef
-#
-# [*install_bridge_utils*]
-#   (optional) Whether to install the bridge-utils package or not.
-#   Applicable only for cases when Neutron was disabled
-#   Defaults to undef
-#
 # [*vcpu_pin_set*]
 #   (optional) A list or range of host CPU cores to which processes for
 #   unpinned instance CPUs (VCPUs) can be scheduled, if cpu_shared_set is set,
@@ -362,8 +353,6 @@ class nova::compute (
   $block_device_allocate_retries               = $::os_service_default,
   $block_device_allocate_retries_interval      = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $neutron_enabled                             = undef,
-  $install_bridge_utils                        = undef,
   $vcpu_pin_set                                = undef,
   $allow_resize_to_same_host                   = undef,
   $pci_passthrough                             = undef,
@@ -395,14 +384,6 @@ class nova::compute (
 
   include nova::compute::vgpu
 
-  if $neutron_enabled {
-    warning('neutron_enabled is deprecated and has no effect, was only used for install_bridge_utils')
-  }
-
-  if $install_bridge_utils {
-    warning('install_bridge_utils is deprecated and has no effect')
-  }
-
   if ($vnc_enabled and $spice_enabled) {
     fail('vnc_enabled and spice_enabled is mutually exclusive')
   }
diff --git a/releasenotes/notes/remove-install-bridge-utils-2043526f3cb40ad1.yaml b/releasenotes/notes/remove-install-bridge-utils-2043526f3cb40ad1.yaml
new file mode 100644
index 000000000..7b44e39be
--- /dev/null
+++ b/releasenotes/notes/remove-install-bridge-utils-2043526f3cb40ad1.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The following two parameters of the ``nova::compute`` class have been
+    removed.
+
+    - ``neutron_enabled``
+    - ``install_bridge_utils``