openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Deprecate nova_metadata_ip"

This commit is contained in:
Zuul 2019-04-01 13:08:59 +00:00 committed by Gerrit Code Review
parent c137849d15 888c8dc46c
commit f56ed9d70f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/agents/metadata.pp
View File

@ -29,9 +29,6 @@
# [*nova_client_priv_key*]
# 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*]
# The hostname of the metadata service. Defaults to $::os_service_default.
#
@ -66,6 +63,11 @@
# in the metadata config.
# Defaults to false.
#
# DEPRECATED
#
# [*metadata_ip*]
# (optional) This option is deprecated an has no effect
#
class neutron::agents::metadata (
$shared_secret,
@ -74,7 +76,6 @@ class neutron::agents::metadata (
$manage_service = true,
$debug = $::os_service_default,
$auth_ca_cert = $::os_service_default,
$metadata_ip = $::os_service_default,
$metadata_host = $::os_service_default,
$metadata_port = $::os_service_default,
$metadata_protocol = $::os_service_default,
@ -85,6 +86,7 @@ class neutron::agents::metadata (
$nova_client_cert = $::os_service_default,
$nova_client_priv_key = $::os_service_default,
$purge_config = false,
$metadata_ip = undef,
) {
include ::neutron::deps
@ -97,7 +99,6 @@ class neutron::agents::metadata (
neutron_metadata_agent_config {
'DEFAULT/debug': value => $debug;
'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_port': value => $metadata_port;
'DEFAULT/nova_metadata_protocol': value => $metadata_protocol;
@ -119,6 +120,10 @@ class neutron::agents::metadata (
}
}
if $metadata_ip {
warning('nova_metadata_ip is deprecated, please use nova_metadata_host instead')
}
if $::neutron::params::metadata_agent_package {
package { 'neutron-metadata':
ensure => $package_ensure,

1
spec/classes/neutron_agents_metadata_spec.rb
View File

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