From f52502f2835e850a901277e5c7af8f3ca33d673d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 19 Jan 2024 10:43:45 +0900 Subject: [PATCH] Drop compatibility with very old puppetlabs-inifile The logic is no longer needed since puppetlabs-inifile 0.10.0[1] and the current minimum version is 2.0.0. [1] https://github.com/puppetlabs/puppetlabs-inifile/commit/2f22483c87dbaee9b45d121a65f2a09dbe638eaa Change-Id: I589847c426560c66e651193ed03a2bcefde72194 --- lib/puppet/provider/eswitchd_config/ini_setting.rb | 5 ----- .../provider/ironic_neutron_agent_config/ini_setting.rb | 5 ----- .../provider/neutron_agent_linuxbridge/ini_setting.rb | 5 ----- lib/puppet/provider/neutron_agent_macvtap/ini_setting.rb | 5 ----- lib/puppet/provider/neutron_agent_ovn/ini_setting.rb | 4 ---- lib/puppet/provider/neutron_agent_ovs/ini_setting.rb | 5 ----- .../provider/neutron_bgp_dragent_config/ini_setting.rb | 5 ----- .../neutron_bgpvpn_bagpipe_config/openstackconfig.rb | 5 ----- .../neutron_bgpvpn_service_config/openstackconfig.rb | 5 ----- lib/puppet/provider/neutron_config/openstackconfig.rb | 5 ----- .../provider/neutron_dhcp_agent_config/ini_setting.rb | 5 ----- .../provider/neutron_l2gw_agent_config/ini_setting.rb | 5 ----- .../neutron_l2gw_service_config/openstackconfig.rb | 5 ----- lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb | 7 ------- .../provider/neutron_metadata_agent_config/ini_setting.rb | 5 ----- .../provider/neutron_metering_agent_config/ini_setting.rb | 5 ----- .../provider/neutron_mlnx_agent_config/ini_setting.rb | 5 ----- lib/puppet/provider/neutron_plugin_ml2/ini_setting.rb | 5 ----- .../provider/neutron_plugin_opencontrail/ini_setting.rb | 5 ----- lib/puppet/provider/neutron_rootwrap_config/ini_setting.rb | 5 ----- .../provider/neutron_sfc_service_config/openstackconfig.rb | 5 ----- .../provider/neutron_sriov_agent_config/ini_setting.rb | 5 ----- .../provider/neutron_vpnaas_agent_config/ini_setting.rb | 5 ----- .../neutron_vpnaas_service_config/openstackconfig.rb | 5 ----- .../provider/ovn_metadata_agent_config/ini_setting.rb | 5 ----- 25 files changed, 126 deletions(-) diff --git a/lib/puppet/provider/eswitchd_config/ini_setting.rb b/lib/puppet/provider/eswitchd_config/ini_setting.rb index 72b886cab..3f4c88b2a 100644 --- a/lib/puppet/provider/eswitchd_config/ini_setting.rb +++ b/lib/puppet/provider/eswitchd_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:eswitchd_config).provide( '/etc/neutron/plugins/ml2/eswitchd.conf' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/ironic_neutron_agent_config/ini_setting.rb b/lib/puppet/provider/ironic_neutron_agent_config/ini_setting.rb index 1ba69b5ef..374469a04 100644 --- a/lib/puppet/provider/ironic_neutron_agent_config/ini_setting.rb +++ b/lib/puppet/provider/ironic_neutron_agent_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:ironic_neutron_agent_config).provide( '/etc/neutron/plugins/ml2/ironic_neutron_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb b/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb index cf8057770..1b5855edd 100644 --- a/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb +++ b/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_agent_linuxbridge).provide( '/etc/neutron/plugins/ml2/linuxbridge_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_agent_macvtap/ini_setting.rb b/lib/puppet/provider/neutron_agent_macvtap/ini_setting.rb index 0533a41b3..f02bda0d5 100644 --- a/lib/puppet/provider/neutron_agent_macvtap/ini_setting.rb +++ b/lib/puppet/provider/neutron_agent_macvtap/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_agent_macvtap).provide( '/etc/neutron/plugins/ml2/macvtap_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_agent_ovn/ini_setting.rb b/lib/puppet/provider/neutron_agent_ovn/ini_setting.rb index 506b793bc..129bd1cf8 100644 --- a/lib/puppet/provider/neutron_agent_ovn/ini_setting.rb +++ b/lib/puppet/provider/neutron_agent_ovn/ini_setting.rb @@ -7,8 +7,4 @@ Puppet::Type.type(:neutron_agent_ovn).provide( '/etc/neutron/plugins/ml2/ovn_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end end diff --git a/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb b/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb index 09ba2dbbb..06b8d4f71 100644 --- a/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb +++ b/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_agent_ovs).provide( '/etc/neutron/plugins/ml2/openvswitch_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_bgp_dragent_config/ini_setting.rb b/lib/puppet/provider/neutron_bgp_dragent_config/ini_setting.rb index c11ba58b8..b1352ffbe 100644 --- a/lib/puppet/provider/neutron_bgp_dragent_config/ini_setting.rb +++ b/lib/puppet/provider/neutron_bgp_dragent_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_bgp_dragent_config).provide( '/etc/neutron/bgp_dragent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_bgpvpn_bagpipe_config/openstackconfig.rb b/lib/puppet/provider/neutron_bgpvpn_bagpipe_config/openstackconfig.rb index 5cfe16282..dd7876caa 100644 --- a/lib/puppet/provider/neutron_bgpvpn_bagpipe_config/openstackconfig.rb +++ b/lib/puppet/provider/neutron_bgpvpn_bagpipe_config/openstackconfig.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_bgpvpn_bagpipe_config).provide( '/etc/neutron/bagpipe-bgp/bgp.conf' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_bgpvpn_service_config/openstackconfig.rb b/lib/puppet/provider/neutron_bgpvpn_service_config/openstackconfig.rb index 1f82c51b5..e4d860394 100644 --- a/lib/puppet/provider/neutron_bgpvpn_service_config/openstackconfig.rb +++ b/lib/puppet/provider/neutron_bgpvpn_service_config/openstackconfig.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_bgpvpn_service_config).provide( '/etc/neutron/networking_bgpvpn.conf' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_config/openstackconfig.rb b/lib/puppet/provider/neutron_config/openstackconfig.rb index 85c8e204e..044d91805 100644 --- a/lib/puppet/provider/neutron_config/openstackconfig.rb +++ b/lib/puppet/provider/neutron_config/openstackconfig.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_config).provide( '/etc/neutron/neutron.conf' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_dhcp_agent_config/ini_setting.rb b/lib/puppet/provider/neutron_dhcp_agent_config/ini_setting.rb index bf0d8cdd2..f505b6355 100644 --- a/lib/puppet/provider/neutron_dhcp_agent_config/ini_setting.rb +++ b/lib/puppet/provider/neutron_dhcp_agent_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_dhcp_agent_config).provide( '/etc/neutron/dhcp_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_l2gw_agent_config/ini_setting.rb b/lib/puppet/provider/neutron_l2gw_agent_config/ini_setting.rb index a0691f70a..62c6b27c6 100644 --- a/lib/puppet/provider/neutron_l2gw_agent_config/ini_setting.rb +++ b/lib/puppet/provider/neutron_l2gw_agent_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_l2gw_agent_config).provide( '/etc/neutron/l2gateway_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_l2gw_service_config/openstackconfig.rb b/lib/puppet/provider/neutron_l2gw_service_config/openstackconfig.rb index 8be56ef8b..fc2562ee0 100644 --- a/lib/puppet/provider/neutron_l2gw_service_config/openstackconfig.rb +++ b/lib/puppet/provider/neutron_l2gw_service_config/openstackconfig.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_l2gw_service_config).provide( '/etc/neutron/l2gw_plugin.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb b/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb index 8e7160f8c..49d82955f 100644 --- a/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb +++ b/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb @@ -1,6 +1,3 @@ -require File.join(File.dirname(__FILE__), '..','..','..', - 'puppet/provider/neutron') - Puppet::Type.type(:neutron_l3_agent_config).provide( :ini_setting, :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting) @@ -10,8 +7,4 @@ Puppet::Type.type(:neutron_l3_agent_config).provide( '/etc/neutron/l3_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end end diff --git a/lib/puppet/provider/neutron_metadata_agent_config/ini_setting.rb b/lib/puppet/provider/neutron_metadata_agent_config/ini_setting.rb index 4d05d61f9..cabaf89a0 100644 --- a/lib/puppet/provider/neutron_metadata_agent_config/ini_setting.rb +++ b/lib/puppet/provider/neutron_metadata_agent_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_metadata_agent_config).provide( '/etc/neutron/metadata_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_metering_agent_config/ini_setting.rb b/lib/puppet/provider/neutron_metering_agent_config/ini_setting.rb index 668c46a5e..4c5784a92 100644 --- a/lib/puppet/provider/neutron_metering_agent_config/ini_setting.rb +++ b/lib/puppet/provider/neutron_metering_agent_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_metering_agent_config).provide( '/etc/neutron/metering_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_mlnx_agent_config/ini_setting.rb b/lib/puppet/provider/neutron_mlnx_agent_config/ini_setting.rb index f6eb40923..31f98f00a 100644 --- a/lib/puppet/provider/neutron_mlnx_agent_config/ini_setting.rb +++ b/lib/puppet/provider/neutron_mlnx_agent_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_mlnx_agent_config).provide( '/etc/neutron/plugins/mlnx/mlnx_conf.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_plugin_ml2/ini_setting.rb b/lib/puppet/provider/neutron_plugin_ml2/ini_setting.rb index 83ad6e355..b7875bdee 100644 --- a/lib/puppet/provider/neutron_plugin_ml2/ini_setting.rb +++ b/lib/puppet/provider/neutron_plugin_ml2/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_plugin_ml2).provide( '/etc/neutron/plugins/ml2/ml2_conf.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_plugin_opencontrail/ini_setting.rb b/lib/puppet/provider/neutron_plugin_opencontrail/ini_setting.rb index 8f23a7ad6..104deadb1 100644 --- a/lib/puppet/provider/neutron_plugin_opencontrail/ini_setting.rb +++ b/lib/puppet/provider/neutron_plugin_opencontrail/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_plugin_opencontrail).provide( '/etc/neutron/plugins/opencontrail/ContrailPlugin.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_rootwrap_config/ini_setting.rb b/lib/puppet/provider/neutron_rootwrap_config/ini_setting.rb index 238869448..092c56629 100644 --- a/lib/puppet/provider/neutron_rootwrap_config/ini_setting.rb +++ b/lib/puppet/provider/neutron_rootwrap_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_rootwrap_config).provide( '/etc/neutron/rootwrap.conf' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_sfc_service_config/openstackconfig.rb b/lib/puppet/provider/neutron_sfc_service_config/openstackconfig.rb index d2a005efc..c6b9b57cb 100644 --- a/lib/puppet/provider/neutron_sfc_service_config/openstackconfig.rb +++ b/lib/puppet/provider/neutron_sfc_service_config/openstackconfig.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_sfc_service_config).provide( '/etc/neutron/conf.d/neutron-server/networking-sfc.conf' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_sriov_agent_config/ini_setting.rb b/lib/puppet/provider/neutron_sriov_agent_config/ini_setting.rb index 0fcc0349b..7de1608f3 100644 --- a/lib/puppet/provider/neutron_sriov_agent_config/ini_setting.rb +++ b/lib/puppet/provider/neutron_sriov_agent_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_sriov_agent_config).provide( '/etc/neutron/plugins/ml2/sriov_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb b/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb index e82abdbf9..f0b997e26 100644 --- a/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb +++ b/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_vpnaas_agent_config).provide( '/etc/neutron/vpn_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/neutron_vpnaas_service_config/openstackconfig.rb b/lib/puppet/provider/neutron_vpnaas_service_config/openstackconfig.rb index 09bcb860b..22eda6089 100644 --- a/lib/puppet/provider/neutron_vpnaas_service_config/openstackconfig.rb +++ b/lib/puppet/provider/neutron_vpnaas_service_config/openstackconfig.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_vpnaas_service_config).provide( '/etc/neutron/neutron_vpnaas.conf' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/provider/ovn_metadata_agent_config/ini_setting.rb b/lib/puppet/provider/ovn_metadata_agent_config/ini_setting.rb index ab5b034a0..172fd732d 100644 --- a/lib/puppet/provider/ovn_metadata_agent_config/ini_setting.rb +++ b/lib/puppet/provider/ovn_metadata_agent_config/ini_setting.rb @@ -7,9 +7,4 @@ Puppet::Type.type(:ovn_metadata_agent_config).provide( '/etc/neutron/neutron_ovn_metadata_agent.ini' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end