diff --git a/lib/puppet/type/ovn_metadata_agent_config.rb b/lib/puppet/type/ovn_metadata_agent_config.rb index 23076f5b5..ef57e8914 100644 --- a/lib/puppet/type/ovn_metadata_agent_config.rb +++ b/lib/puppet/type/ovn_metadata_agent_config.rb @@ -3,7 +3,7 @@ Puppet::Type.newtype(:ovn_metadata_agent_config) do ensurable newparam(:name, :namevar => true) do - desc 'Section/setting name to manage from neutron_ovn_metadata_agent.ini' + desc 'Section/setting name to manage from neutron_ovn_metadata_agent.ini (DEPRECATED)' newvalues(/\S+\/\S+/) end diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp index 87da09501..6a0af518b 100644 --- a/manifests/agents/ovn_metadata.pp +++ b/manifests/agents/ovn_metadata.pp @@ -1,5 +1,6 @@ # == Class: neutron::agents::ovn_metadata # +# DEPRECATED !! # Setup and configure neutron ovn metadata agent. # # === Parameters @@ -152,6 +153,8 @@ class neutron::agents::ovn_metadata ( include neutron::deps include neutron::params + warning('ovn-metadata-agent is deprecated') + resources { 'ovn_metadata_agent_config': purge => $purge_config, } diff --git a/manifests/agents/ovn_metadata/metadata_rate_limiting.pp b/manifests/agents/ovn_metadata/metadata_rate_limiting.pp index 555c64880..7a798693f 100644 --- a/manifests/agents/ovn_metadata/metadata_rate_limiting.pp +++ b/manifests/agents/ovn_metadata/metadata_rate_limiting.pp @@ -12,6 +12,7 @@ # # == Class: neutron::agents:ovn_metadata::metadata_rate_limiting # +# DEPRECATED !! # Setups metadata ratelimit options for ovn metadata agent # # === Parameters @@ -51,6 +52,8 @@ class neutron::agents::ovn_metadata::metadata_rate_limiting ( ) { include neutron::deps + warning('ovn-metadata-agent is deprecated') + ovn_metadata_agent_config { 'metadata_rate_limiting/rate_limit_enabled': value => $rate_limit_enabled; 'metadata_rate_limiting/ip_versions': value => join(any2array($ip_versions), ','); diff --git a/manifests/config.pp b/manifests/config.pp index af24b49fe..31abce9e7 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -66,9 +66,6 @@ # [*metadata_agent_config*] # (optional) Manage configuration of metadata_agent.ini # -# [*ovn_metadata_agent_config*] -# (optional) Manage configuration of neutron_ovn_metadata_agent.ini -# # [*metering_agent_config*] # (optional) Manage configuration of metering_agent.ini # @@ -90,6 +87,11 @@ # [*plugin_ml2_config*] # (optional) Manage configuration of ml2_conf.ini # +# DEPRECATED PARAMETERS +# +# [*ovn_metadata_agent_config*] +# (optional) Manage configuration of neutron_ovn_metadata_agent.ini +# # NOTE: The configuration MUST NOT be already handled by this module # or Puppet catalog compilation will fail with duplicate resources. # @@ -109,7 +111,6 @@ class neutron::config ( Hash $l3_agent_config = {}, Hash $dhcp_agent_config = {}, Hash $metadata_agent_config = {}, - Hash $ovn_metadata_agent_config = {}, Hash $metering_agent_config = {}, Hash $vpnaas_agent_config = {}, Hash $vpnaas_service_config = {}, @@ -117,6 +118,8 @@ class neutron::config ( Hash $taas_service_config = {}, Hash $bgp_dragent_config = {}, Hash $plugin_ml2_config = {}, + # DEPRECATED PARAMETERS + Optional[Hash] $ovn_metadata_agent_config = undef, ) { include neutron::deps @@ -136,7 +139,6 @@ class neutron::config ( create_resources('neutron_l3_agent_config', $l3_agent_config) create_resources('neutron_dhcp_agent_config', $dhcp_agent_config) create_resources('neutron_metadata_agent_config', $metadata_agent_config) - create_resources('ovn_metadata_agent_config', $ovn_metadata_agent_config) create_resources('neutron_metering_agent_config', $metering_agent_config) create_resources('neutron_vpnaas_agent_config', $vpnaas_agent_config) create_resources('neutron_vpnaas_service_config', $vpnaas_service_config) @@ -144,4 +146,9 @@ class neutron::config ( create_resources('neutron_taas_service_config', $taas_service_config) create_resources('neutron_bgp_dragent_config', $bgp_dragent_config) create_resources('neutron_plugin_ml2', $plugin_ml2_config) + + if $ovn_metadata_agent_config != undef { + warning('The ovn_metadata_agent_config parameter is deprecated') + create_resources('ovn_metadata_agent_config', $ovn_metadata_agent_config) + } } diff --git a/releasenotes/notes/deprecate-ovn-metadata-agent-764791d56fe538e6.yaml b/releasenotes/notes/deprecate-ovn-metadata-agent-764791d56fe538e6.yaml new file mode 100644 index 000000000..2762534d5 --- /dev/null +++ b/releasenotes/notes/deprecate-ovn-metadata-agent-764791d56fe538e6.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + Support for Ovn Metadata Agent service has been deprecated, because + the service was deprecated in neutron.