openstack/puppet-neutron
Code Issues Proposed changes

Merge "Start using nova_metadata_host"

Browse Source
This commit is contained in:
Zuul 2018-03-12 16:45:47 +00:00 committed by Gerrit Code Review
commit 27e5448553
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/plugins/plumgrid.pp
View File

@ -50,6 +50,10 @@
# Nova metadata IP # Nova metadata IP
# Defaults to 127.0.0.1 # Defaults to 127.0.0.1
# #
# [*nova_metadata_host*]
# Nova metadata host
# Defaults to 127.0.0.1
#
# [*nova_metadata_port*] # [*nova_metadata_port*]
# Nova metadata port # Nova metadata port
# Defaults to 8775 # Defaults to 8775
@ -104,6 +108,7 @@ class neutron::plugins::plumgrid (
$identity_version = 'v3', $identity_version = 'v3',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$nova_metadata_ip = '127.0.0.1', $nova_metadata_ip = '127.0.0.1',
$nova_metadata_host = '127.0.0.1',
$nova_metadata_port = '8775', $nova_metadata_port = '8775',
$nova_metadata_subnet = '127.0.0.1/24', $nova_metadata_subnet = '127.0.0.1/24',
$metadata_proxy_shared_secret = $::os_service_default, $metadata_proxy_shared_secret = $::os_service_default,
@ -183,6 +188,7 @@ class neutron::plugins::plumgrid (
'PLUMgridMetadata/enable_pg_metadata' : value => 'True'; 'PLUMgridMetadata/enable_pg_metadata' : value => 'True';
'PLUMgridMetadata/metadata_mode': value => 'local'; 'PLUMgridMetadata/metadata_mode': value => 'local';
'PLUMgridMetadata/nova_metadata_ip': value => $nova_metadata_ip; 'PLUMgridMetadata/nova_metadata_ip': value => $nova_metadata_ip;
'PLUMgridMetadata/nova_metadata_host': value => $nova_metadata_host;
'PLUMgridMetadata/nova_metadata_port': value => $nova_metadata_port; 'PLUMgridMetadata/nova_metadata_port': value => $nova_metadata_port;
'PLUMgridMetadata/nova_metadata_subnet': value => $nova_metadata_subnet; 'PLUMgridMetadata/nova_metadata_subnet': value => $nova_metadata_subnet;
'PLUMgridMetadata/metadata_proxy_shared_secret': value => $metadata_proxy_shared_secret, secret =>true; 'PLUMgridMetadata/metadata_proxy_shared_secret': value => $metadata_proxy_shared_secret, secret =>true;

6
releasenotes/notes/update_plumgrid_nova_metadata_host-7560036d9ab1d7ae.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- PLUMgrid neutron plugin now specifies both nova_metadata_ip and
nova_metadata_host values since the former was deprecated in the
Queens cycle. When older releases are no longer supported
nova_metadata_ip can be removed.

2
spec/classes/neutron_plugins_plumgrid_spec.rb
View File

@ -21,6 +21,7 @@ describe 'neutron::plugins::plumgrid' do
:identity_version => 'v3', :identity_version => 'v3',
:user_domain_name => 'Default', :user_domain_name => 'Default',
:nova_metadata_ip => '127.0.0.1', :nova_metadata_ip => '127.0.0.1',
:nova_metadata_host => '127.0.0.1',
:nova_metadata_port => '8775', :nova_metadata_port => '8775',
:nova_metadata_subnet => '127.0.0.1/24', :nova_metadata_subnet => '127.0.0.1/24',
:connector_type => 'distributed', :connector_type => 'distributed',
@ -88,6 +89,7 @@ describe 'neutron::plugins::plumgrid' do
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/enable_pg_metadata').with_value('True') is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/enable_pg_metadata').with_value('True')
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_mode').with_value('local') is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_mode').with_value('local')
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_ip').with_value(params[:nova_metadata_ip]) is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_ip').with_value(params[:nova_metadata_ip])
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_host').with_value(params[:nova_metadata_host])
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_port').with_value(params[:nova_metadata_port]) is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_port').with_value(params[:nova_metadata_port])
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_subnet').with_value(params[:nova_metadata_subnet]) is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_subnet').with_value(params[:nova_metadata_subnet])
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_proxy_shared_secret').with_value('<SERVICE DEFAULT>').with_secret(true) is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_proxy_shared_secret').with_value('<SERVICE DEFAULT>').with_secret(true)