From 685072bbbb691fd7029a05a461e9f0a0c2cd6965 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 26 Oct 2023 14:45:44 +0900
Subject: [PATCH] Drop package resources for non-existing tempest plugins

Some of the services (eg nova) do not have own tempest plugins. This
removes definition of some package resources which are never used.

Change-Id: I9ebddc6c74db73fe7eed7b71e9b724645e4b694e
---
 manifests/init.pp   | 28 ----------------------------
 manifests/params.pp | 12 ------------
 2 files changed, 40 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index ce8f0fbf..7a902701 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -807,27 +807,6 @@ class tempest(
           tag    => ['openstack', 'tempest-package'],
         }
       }
-      if $neutron_vpnaas_available and $::tempest::params::python_vpnaas_tests {
-        package { 'python-neutron-vpnaas-tests':
-          ensure => present,
-          name   => $::tempest::params::python_vpnaas_tests,
-          tag    => ['openstack', 'tempest-package'],
-        }
-      }
-      if $neutron_dr_available and $::tempest::params::python_dr_tests {
-        package { 'python-neutron-dynamic-routing-tests':
-          ensure => present,
-          name   => $::tempest::params::python_dr_tests,
-          tag    => ['openstack', 'tempest-package'],
-        }
-      }
-    }
-    if $nova_available and $::tempest::params::python_nova_tests {
-      package { 'python-nova-tests':
-        ensure => present,
-        name   => $::tempest::params::python_nova_tests,
-        tag    => ['openstack', 'tempest-package'],
-      }
     }
     if $sahara_available and $::tempest::params::python_sahara_tests {
       package { 'python-sahara-tests-tempest':
@@ -836,13 +815,6 @@ class tempest(
         tag    => ['openstack', 'tempest-package'],
       }
     }
-    if $swift_available and $::tempest::params::python_swift_tests {
-      package { 'python-swift-tests':
-        ensure => present,
-        name   => $::tempest::params::python_swift_tests,
-        tag    => ['openstack', 'tempest-package'],
-      }
-    }
     if $trove_available and $::tempest::params::python_trove_tests {
       package { 'python-trove-tests':
         ensure => present,
diff --git a/manifests/params.pp b/manifests/params.pp
index 56304ba3..7426bb26 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -27,11 +27,7 @@ class tempest::params {
       $python_murano_tests     = 'python3-murano-tests-tempest'
       $python_neutron_tests    = 'python3-neutron-tests-tempest'
       $python_l2gw_tests       = 'python3-networking-l2gw-tests-tempest'
-      $python_vpnaas_tests     = false
-      $python_dr_tests         = false
-      $python_nova_tests       = false
       $python_sahara_tests     = 'python3-sahara-tests-tempest'
-      $python_swift_tests      = false
       $python_trove_tests      = 'python3-trove-tests-tempest'
       $python_watcher_tests    = 'python3-watcher-tests-tempest'
       $python_zaqar_tests      = 'python3-zaqar-tests-tempest'
@@ -67,11 +63,7 @@ class tempest::params {
         $python_murano_tests     = 'murano-tempest-plugin'
         $python_neutron_tests    = 'neutron-tempest-plugin'
         $python_l2gw_tests       = false
-        $python_vpnaas_tests     = false
-        $python_dr_tests         = false
-        $python_nova_tests       = false
         $python_sahara_tests     = false
-        $python_swift_tests      = false
         $python_trove_tests      = 'trove-tempest-plugin'
         $python_watcher_tests    = 'watcher-tempest-plugin'
         $python_zaqar_tests      = 'zaqar-tempest-plugin'
@@ -93,12 +85,8 @@ class tempest::params {
         $python_vitrage_tests    = false
         $python_murano_tests     = false
         $python_neutron_tests    = false
-        $python_vpnaas_tests     = false
-        $python_dr_tests         = false
         $python_l2gw_tests       = false
-        $python_nova_tests       = false
         $python_sahara_tests     = false
-        $python_swift_tests      = false
         $python_trove_tests      = false
         $python_watcher_tests    = false
         $python_zaqar_tests      = false