Merge "Drop compatibility with very old puppetlabs-inifile"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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