Merge "Drop compatibility with very old puppetlabs-inifile"

This commit is contained in:
Zuul 2024-01-22 17:12:51 +00:00 committed by Gerrit Code Review
commit 3ea19aaea1
25 changed files with 0 additions and 126 deletions

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:eswitchd_config).provide(
'/etc/neutron/plugins/ml2/eswitchd.conf' '/etc/neutron/plugins/ml2/eswitchd.conf'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:ironic_neutron_agent_config).provide(
'/etc/neutron/plugins/ml2/ironic_neutron_agent.ini' '/etc/neutron/plugins/ml2/ironic_neutron_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_agent_linuxbridge).provide(
'/etc/neutron/plugins/ml2/linuxbridge_agent.ini' '/etc/neutron/plugins/ml2/linuxbridge_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_agent_macvtap).provide(
'/etc/neutron/plugins/ml2/macvtap_agent.ini' '/etc/neutron/plugins/ml2/macvtap_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,8 +7,4 @@ Puppet::Type.type(:neutron_agent_ovn).provide(
'/etc/neutron/plugins/ml2/ovn_agent.ini' '/etc/neutron/plugins/ml2/ovn_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_agent_ovs).provide(
'/etc/neutron/plugins/ml2/openvswitch_agent.ini' '/etc/neutron/plugins/ml2/openvswitch_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_bgp_dragent_config).provide(
'/etc/neutron/bgp_dragent.ini' '/etc/neutron/bgp_dragent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_bgpvpn_bagpipe_config).provide(
'/etc/neutron/bagpipe-bgp/bgp.conf' '/etc/neutron/bagpipe-bgp/bgp.conf'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_bgpvpn_service_config).provide(
'/etc/neutron/networking_bgpvpn.conf' '/etc/neutron/networking_bgpvpn.conf'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_config).provide(
'/etc/neutron/neutron.conf' '/etc/neutron/neutron.conf'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_dhcp_agent_config).provide(
'/etc/neutron/dhcp_agent.ini' '/etc/neutron/dhcp_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_l2gw_agent_config).provide(
'/etc/neutron/l2gateway_agent.ini' '/etc/neutron/l2gateway_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_l2gw_service_config).provide(
'/etc/neutron/l2gw_plugin.ini' '/etc/neutron/l2gw_plugin.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -1,6 +1,3 @@
require File.join(File.dirname(__FILE__), '..','..','..',
'puppet/provider/neutron')
Puppet::Type.type(:neutron_l3_agent_config).provide( Puppet::Type.type(:neutron_l3_agent_config).provide(
:ini_setting, :ini_setting,
:parent => Puppet::Type.type(:openstack_config).provider(: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' '/etc/neutron/l3_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_metadata_agent_config).provide(
'/etc/neutron/metadata_agent.ini' '/etc/neutron/metadata_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_metering_agent_config).provide(
'/etc/neutron/metering_agent.ini' '/etc/neutron/metering_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_mlnx_agent_config).provide(
'/etc/neutron/plugins/mlnx/mlnx_conf.ini' '/etc/neutron/plugins/mlnx/mlnx_conf.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_plugin_ml2).provide(
'/etc/neutron/plugins/ml2/ml2_conf.ini' '/etc/neutron/plugins/ml2/ml2_conf.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_plugin_opencontrail).provide(
'/etc/neutron/plugins/opencontrail/ContrailPlugin.ini' '/etc/neutron/plugins/opencontrail/ContrailPlugin.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_rootwrap_config).provide(
'/etc/neutron/rootwrap.conf' '/etc/neutron/rootwrap.conf'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_sfc_service_config).provide(
'/etc/neutron/conf.d/neutron-server/networking-sfc.conf' '/etc/neutron/conf.d/neutron-server/networking-sfc.conf'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_sriov_agent_config).provide(
'/etc/neutron/plugins/ml2/sriov_agent.ini' '/etc/neutron/plugins/ml2/sriov_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_vpnaas_agent_config).provide(
'/etc/neutron/vpn_agent.ini' '/etc/neutron/vpn_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:neutron_vpnaas_service_config).provide(
'/etc/neutron/neutron_vpnaas.conf' '/etc/neutron/neutron_vpnaas.conf'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end

View File

@ -7,9 +7,4 @@ Puppet::Type.type(:ovn_metadata_agent_config).provide(
'/etc/neutron/neutron_ovn_metadata_agent.ini' '/etc/neutron/neutron_ovn_metadata_agent.ini'
end end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end end