openstack/puppet-neutron
Code Issues Proposed changes

ovn-metadata: Deprecate support for [DEFAULT] nova_metadata_ip

Browse Source 
The parameter was deprecated during Queens cycle[1] and was removed
during Rocky cycle.

[1] 366dd7cc37c053e0fff897b16414c960243abcfc
[2] 366dd7cc37c053e0fff897b16414c960243abcfc

Change-Id: Ia53deafcf0b70d7c5b8e83e572e4ce0047d8e6ad
This commit is contained in:
Takashi Kajinami 2022-05-04 22:46:53 +09:00
parent df0d55cf78
commit 189d7d6bea
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/agents/ovn_metadata.pp
View File

@ -29,9 +29,6 @@
# [*nova_client_priv_key*] # [*nova_client_priv_key*]
# Private key of client certificate. (Defaults to $::os_service_default) # Private key of client certificate. (Defaults to $::os_service_default)
# #
# [*metadata_ip*]
# The IP address of the metadata service. Defaults to $::os_service_default.
#
# [*metadata_host*] # [*metadata_host*]
# The hostname of the metadata service. Defaults to $::os_service_default. # The hostname of the metadata service. Defaults to $::os_service_default.
# #
@ -112,6 +109,10 @@
# (optional) Set probe interval, based on user configuration, value is in ms # (optional) Set probe interval, based on user configuration, value is in ms
# Defaults to undef # Defaults to undef
# #
# [*metadata_ip*]
# The IP address of the metadata service.
# Defaults to undef
#
class neutron::agents::ovn_metadata ( class neutron::agents::ovn_metadata (
$shared_secret, $shared_secret,
$package_ensure = 'present', $package_ensure = 'present',
@ -119,7 +120,6 @@ class neutron::agents::ovn_metadata (
$manage_service = true, $manage_service = true,
$debug = false, $debug = false,
$auth_ca_cert = $::os_service_default, $auth_ca_cert = $::os_service_default,
$metadata_ip = $::os_service_default,
$metadata_host = $::os_service_default, $metadata_host = $::os_service_default,
$metadata_port = $::os_service_default, $metadata_port = $::os_service_default,
$metadata_protocol = $::os_service_default, $metadata_protocol = $::os_service_default,
@ -141,6 +141,7 @@ class neutron::agents::ovn_metadata (
$purge_config = false, $purge_config = false,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$ovn_remote_probe_interval = undef, $ovn_remote_probe_interval = undef,
$metadata_ip = undef,
) { ) {
include neutron::deps include neutron::deps
@ -153,6 +154,13 @@ class neutron::agents::ovn_metadata (
'ovn/ovn_remote_probe_interval': ensure => absent; 'ovn/ovn_remote_probe_interval': ensure => absent;
} }
if $metadata_ip != undef {
warning('The metadata_ip parameter is deprecated and has no effect')
}
ovn_metadata_agent_config {
'DEFAULT/nova_metadata_ip': ensure => absent;
}
resources { 'ovn_metadata_agent_config': resources { 'ovn_metadata_agent_config':
purge => $purge_config, purge => $purge_config,
} }
@ -160,7 +168,6 @@ class neutron::agents::ovn_metadata (
ovn_metadata_agent_config { ovn_metadata_agent_config {
'DEFAULT/debug': value => $debug; 'DEFAULT/debug': value => $debug;
'DEFAULT/auth_ca_cert': value => $auth_ca_cert; 'DEFAULT/auth_ca_cert': value => $auth_ca_cert;
'DEFAULT/nova_metadata_ip': value => $metadata_ip;
'DEFAULT/nova_metadata_host': value => $metadata_host; 'DEFAULT/nova_metadata_host': value => $metadata_host;
'DEFAULT/nova_metadata_port': value => $metadata_port; 'DEFAULT/nova_metadata_port': value => $metadata_port;
'DEFAULT/nova_metadata_protocol': value => $metadata_protocol; 'DEFAULT/nova_metadata_protocol': value => $metadata_protocol;

5
releasenotes/notes/deprecate-ovn_metadata-metadata_ip-53f9aef4c6bd1a6b.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``neutron::agents::ovn_metadata::metadata_ip`` parameter has been
deprecated and has no effect now.

1
spec/classes/neutron_agents_ovn_metadata_spec.rb
View File

@ -53,7 +53,6 @@ describe 'neutron::agents::ovn_metadata' do
should contain_ovn_metadata_agent_config('DEFAULT/auth_ca_cert').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/auth_ca_cert').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/nova_client_cert').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/nova_client_cert').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/nova_client_priv_key').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/nova_client_priv_key').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_ip').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_host').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_host').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_port').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_port').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_protocol').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_protocol').with(:value => '<SERVICE DEFAULT>')