openstack/puppet-neutron
Code Issues Proposed changes

Merge "ovn: Deprecate the ovn_remote_probe_interval parameter"

Browse Source
This commit is contained in:
Zuul 2021-11-03 15:24:29 +00:00 committed by Gerrit Code Review
commit 303def38df
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/agents/ovn_metadata.pp
View File

@ -106,9 +106,11 @@
# in the metadata config.
# Defaults to false.
#
# DEPRECATED PARAMETERS
#
# [*ovn_remote_probe_interval*]
# (optional) Set probe interval, based on user configuration, value is in ms
# Defaults to 60000
# Defaults to undef
#
class neutron::agents::ovn_metadata (
$shared_secret,
@ -137,12 +139,20 @@ class neutron::agents::ovn_metadata (
$root_helper_daemon = $::os_service_default,
$state_path = '/var/lib/neutron',
$purge_config = false,
$ovn_remote_probe_interval = $::os_service_default,
# DEPRECATED PARAMETERS
$ovn_remote_probe_interval = undef,
) {
include neutron::deps
include neutron::params
if $ovn_remote_probe_interval != undef {
warning('The ovn_remote_probe_interval parameter is deprecated and has no effect')
}
ovn_metadata_agent_config {
'ovn/ovn_remote_probe_interval': ensure => absent;
}
resources { 'ovn_metadata_agent_config':
purge => $purge_config,
}
@ -169,7 +179,6 @@ class neutron::agents::ovn_metadata (
'ovn/ovn_sb_private_key': value => $ovn_sb_private_key;
'ovn/ovn_sb_certificate': value => $ovn_sb_certificate;
'ovn/ovn_sb_ca_cert': value => $ovn_sb_ca_cert;
'ovn/ovn_remote_probe_interval': value => $ovn_remote_probe_interval;
}
if $::neutron::params::ovn_metadata_agent_package {

6
releasenotes/notes/deprecate-ovn_remote_probe_interval-269bdab63be84041.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The ``neutron::agents::ovn_metadata::ovn_remote_probe_interval`` parameter
has been deprecated and has no effect now. This parameter will be removed
in a future release.

1
spec/classes/neutron_agents_ovn_metadata_spec.rb
View File

@ -67,7 +67,6 @@ describe 'neutron::agents::ovn_metadata' do
should contain_ovn_metadata_agent_config('ovs/ovsdb_connection_timeout').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('ovs/ovsdb_connection').with(:value => params[:ovsdb_connection])
should contain_ovn_metadata_agent_config('ovn/ovn_sb_connection').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('ovn/ovn_remote_probe_interval').with(:value => '<SERVICE DEFAULT>')
end
it 'installs ovn metadata agent package' do