From d894523a6318276bf04e6ac952b55fcc7b6fb8c6 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 22 Sep 2021 22:08:30 +0900
Subject: [PATCH] Remove deprecated nova::compute::vgpu::enabled_vgpu_types

... because the parameter was deprecated during the Victoria cycle[1].

[1] fbf77c0776f2aac341dc7a54a6a82243681d6354
Change-Id: I13745fa1527fe6d4caa530033da4d6d5e0ed963f
---
 manifests/compute/vgpu.pp                     | 21 ++-------------
 ...e-enabled_vgpu_types-8ba902975a329688.yaml |  4 +++
 spec/classes/nova_compute_vgpu_spec.rb        | 27 -------------------
 3 files changed, 6 insertions(+), 46 deletions(-)
 create mode 100644 releasenotes/notes/remove-enabled_vgpu_types-8ba902975a329688.yaml

diff --git a/manifests/compute/vgpu.pp b/manifests/compute/vgpu.pp
index f67009fc8..feb646aa2 100644
--- a/manifests/compute/vgpu.pp
+++ b/manifests/compute/vgpu.pp
@@ -9,29 +9,12 @@
 #   corresponding device addresses as value.
 #   Defaults to {}
 #
-#  DEPRECATED PARAMETERS
-#
-# [*enabled_vgpu_types*]
-#   (optional) Specify which specific GPU type(s) the instances can get
-#   Defaults to undef
-#
-
 class nova::compute::vgpu(
-  $vgpu_types_device_addresses_mapping      = {},
-  # DEPRECATED PARAMETERS
-  $enabled_vgpu_types                       = undef,
+  $vgpu_types_device_addresses_mapping = {},
 ) {
   include nova::deps
 
-  if $enabled_vgpu_types {
-    warning('enabled_vgpu_types is deprecated, instead use vgpu_types_device_addresses_mapping parameter.')
-  }
-
-  if $enabled_vgpu_types != undef and !empty($enabled_vgpu_types) {
-    nova_config {
-      'devices/enabled_vgpu_types': value => join(any2array($enabled_vgpu_types), ',');
-    }
-  } elsif !empty($vgpu_types_device_addresses_mapping) {
+  if !empty($vgpu_types_device_addresses_mapping) {
     validate_legacy(Hash, 'validate_hash', $vgpu_types_device_addresses_mapping)
     $vgpu_types_real = keys($vgpu_types_device_addresses_mapping)
     nova_config {
diff --git a/releasenotes/notes/remove-enabled_vgpu_types-8ba902975a329688.yaml b/releasenotes/notes/remove-enabled_vgpu_types-8ba902975a329688.yaml
new file mode 100644
index 000000000..8387786ec
--- /dev/null
+++ b/releasenotes/notes/remove-enabled_vgpu_types-8ba902975a329688.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``nova::compute::vgpu::enabled_vgpu_types`` parameter has been removed.
diff --git a/spec/classes/nova_compute_vgpu_spec.rb b/spec/classes/nova_compute_vgpu_spec.rb
index c817e383b..f28d7c3e8 100644
--- a/spec/classes/nova_compute_vgpu_spec.rb
+++ b/spec/classes/nova_compute_vgpu_spec.rb
@@ -9,19 +9,6 @@ describe 'nova::compute::vgpu' do
       end
     end
 
-    context 'with vgpu device' do
-      let :params do
-        {
-            :enabled_vgpu_types => "nvidia-35",
-        }
-      end
-      it 'configures nova vgpu device entries' do
-        is_expected.to contain_nova_config('devices/enabled_vgpu_types').with(
-          'value' => 'nvidia-35'
-        )
-      end
-    end
-
     context 'with vgpu types and device addresses mapping' do
       let :params do
         {
@@ -32,20 +19,6 @@ describe 'nova::compute::vgpu' do
       it { is_expected.to contain_nova_config('vgpu_nvidia-35/device_addresses').with_ensure('absent') }
     end
 
-    context 'with multiple vgpu devices' do
-      let :params do
-        {
-          :enabled_vgpu_types => ["nvidia-35","nvidia-36"]
-        }
-      end
-
-      it 'configures nova vgpu device entries' do
-        is_expected.to contain_nova_config('devices/enabled_vgpu_types').with(
-          'value' => "nvidia-35,nvidia-36"
-        )
-      end
-    end
-
     context 'with multiple vgpu types and corresponding device addresses mapping' do
       let :params do
         {