Remove deprecated ip_version parameter

This [pxe] ip_version parameter was deprecated in ironic during Xena
cycle and has been unused by in-tree drivers since Ussuri[1].

This also removes cleanup of [pxe] ipxe_enabled which was added a few
cycles back.

[1] b2a249d186b77def6cd449d34fd600520c159a50

Change-Id: I67ecf2e0bebc93ad20733677662c51ad31619f01

manifests/drivers/pxe.pp

@@ -129,13 +129,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*ip_version*]
-#   DEPRECATED: (optional) The IP version that will be used for PXE booting.
-#   Ironic presently attempts both IPv4 and IPv6, this option is effectively
-#   ignored by ironic, and should anticipate being removed in a future
-#   release.
-#   Defaults to $facts['os_service_default'].
-#
 # [*enable_ppc64le*]
 #   (optional) Boolean value to dtermine if ppc64le support should be enabled
 #   Defaults to false (no ppc64le support)
@@ -164,7 +157,6 @@ class ironic::drivers::pxe (
   $ipxe_bootfile_name_by_arch  = $facts['os_service_default'],
   $pxe_config_template_by_arch = $facts['os_service_default'],
   # DEPRECATED PARAMETERS
-  $ip_version                  = undef,
   Boolean $enable_ppc64le      = false,
 ) inherits ironic::params {
 
@@ -176,11 +168,6 @@ class ironic::drivers::pxe (
   $uefi_ipxe_bootfile_name_real = pick($::ironic::pxe::common::uefi_ipxe_bootfile_name, $uefi_ipxe_bootfile_name)
   $uefi_pxe_bootfile_name_real = pick($::ironic::pxe::common::uefi_pxe_bootfile_name, $uefi_pxe_bootfile_name)
 
-  if $ip_version != undef {
-    warning('The ironic::drivers::pxe:ip_version parameter is deprecated and will be removed in the future.')
-  }
-  $ip_version_real = pick($ip_version, $facts['os_service_default'])
-
   $loader_file_paths_real = $loader_file_paths ? {
     Hash    => join(join_keys_to_values($loader_file_paths, ':'), ','),
     default => join(any2array($loader_file_paths), ',')
@@ -207,8 +194,6 @@ class ironic::drivers::pxe (
     'pxe/dir_permission': value            => $dir_permission;
     'pxe/file_permission': value           => $file_permission;
     'pxe/loader_file_paths': value         => $loader_file_paths_real;
-    'pxe/ipxe_enabled': ensure             => absent;
-    'pxe/ip_version': value                => $ip_version_real;
   }
 
   $pxe_bootfile_name_by_arch_real = $pxe_bootfile_name_by_arch ? {

releasenotes/notes/remove-pxe-ip_version-a8a547b5fd3d24f2.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``ironic::drivers::pxe::ip_version`` parameter has been removed.

spec/classes/ironic_drivers_pxe_spec.rb

@@ -44,7 +44,6 @@ describe 'ironic::drivers::pxe' do
       is_expected.to contain_ironic_config('pxe/dir_permission').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('pxe/file_permission').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('pxe/loader_file_paths').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_config('pxe/ipxe_enabled').with_ensure('absent')
       is_expected.to contain_ironic_config('pxe/pxe_bootfile_name_by_arch').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('pxe/ipxe_bootfile_name_by_arch').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('pxe/pxe_config_template_by_arch').with_value('<SERVICE DEFAULT>')
@@ -86,7 +85,6 @@ describe 'ironic::drivers::pxe' do
             'ipxe.efi:/usr/share/ipxe/ipxe-snponly-x86_64.efi',
             'undionly.kpxe:/usr/share/ipxe/undionly.kpxe'
           ],
-          :ip_version                  => 6,
           :pxe_bootfile_name_by_arch   => [
             'aarch64:grubaa64.efi'
           ],
@@ -118,7 +116,6 @@ describe 'ironic::drivers::pxe' do
         is_expected.to contain_ironic_config('pxe/file_permission').with_value('0o644')
         is_expected.to contain_ironic_config('pxe/loader_file_paths')
           .with_value('ipxe.efi:/usr/share/ipxe/ipxe-snponly-x86_64.efi,undionly.kpxe:/usr/share/ipxe/undionly.kpxe')
-        is_expected.to contain_ironic_config('pxe/ip_version').with_value(params[:ip_version])
         is_expected.to contain_ironic_config('pxe/pxe_bootfile_name_by_arch').with_value('aarch64:grubaa64.efi')
         is_expected.to contain_ironic_config('pxe/ipxe_bootfile_name_by_arch').with_value('aarch64:ipxe_aa64.efi')
         is_expected.to contain_ironic_config('pxe/pxe_config_template_by_arch')