Clean up deprecated tempest::magnum class parameters

Change-Id: I4027d4c9f9180be7c76677bafcb97ce881f075ad
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

manifests/magnum.pp

@@ -67,15 +67,6 @@
 #   (Optional) Manage the plugin package
 #   Defaults to true
 #
-# DEPRECATED PARAMETERS
-#
-# [*keypair_id*]
-#   (Optional) The keypair_id parameter used in Magnum tempest configuration
-#   Defaults to undef
-#
-# [*tempest_config_file*]
-#   Defaults to undef
-#
 class tempest::magnum (
   Boolean $provision_image          = true,
   Optional[String[1]] $image_source = undef,
@@ -92,22 +83,10 @@ class tempest::magnum (
   $dns_nameserver                   = $facts['os_service_default'],
   $catalog_type                     = $facts['os_service_default'],
   Boolean $manage_tests_packages    = true,
-  # DEPRECATED PARAMETERS
-  $keypair_id                       = undef,
-  $tempest_config_file              = undef,
 ) {
   include tempest::params
   include tempest
 
-  if $keypair_id != undef {
-    warning("The keypair_id parameter is deprecated and has no effect. \
-Use the keypair_name parameter.")
-  }
-
-  if $tempest_config_file != undef {
-    warning('The tempest_config_file parameter has been deprecated and has no effect')
-  }
-
   if $provision_image {
     if $image_source == undef {
       fail('The image_source parameter must be set when provision_image is true')
@@ -167,9 +146,4 @@ Use the keypair_name parameter.")
     'magnum/dns_nameserver':   value => $dns_nameserver;
     'magnum/catalog_type':     value => $catalog_type;
   }
-
-  # TODO(tkajinam): Remove this after 2025.1
-  tempest_config {
-    'magnum/keypair_id': ensure => absent;
-  }
 }

releasenotes/notes/magnum-cleanup-params-b69195d4951530c1.yaml

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``tempest::magnum`` class have been
+    removed.
+
+    - ``keypair_id``
+    - ``tempest_config_file``

spec/classes/tempest_init_spec.rb

@@ -352,8 +352,6 @@ describe 'tempest' do
             :use_syslog                    => '<SERVICE DEFAULT>',
             :logging_context_format_string => '<SERVICE DEFAULT>'
           )
-
-          is_expected.not_to contain_tempest_config('magnum/keypair_id').with_value('default')
         end
 
         it 'set glance id' do