From 0aabbf0e1224a9df6035b2983a0a026d043011fc Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Mon, 8 Jan 2018 14:44:59 -0500 Subject: [PATCH] Start using nova_metadata_host nova_metadata_ip was deprecated in Pike and is being removed in Queens, update its usage. Change-Id: I8fa071834a67af6f062970a1f105c2f9a3a341da --- manifests/plugins/plumgrid.pp | 6 ++++++ ...update_plumgrid_nova_metadata_host-7560036d9ab1d7ae.yaml | 6 ++++++ spec/classes/neutron_plugins_plumgrid_spec.rb | 2 ++ 3 files changed, 14 insertions(+) create mode 100644 releasenotes/notes/update_plumgrid_nova_metadata_host-7560036d9ab1d7ae.yaml diff --git a/manifests/plugins/plumgrid.pp b/manifests/plugins/plumgrid.pp index 39395e47a..df24aaceb 100644 --- a/manifests/plugins/plumgrid.pp +++ b/manifests/plugins/plumgrid.pp @@ -50,6 +50,10 @@ # Nova metadata IP # Defaults to 127.0.0.1 # +# [*nova_metadata_host*] +# Nova metadata host +# Defaults to 127.0.0.1 +# # [*nova_metadata_port*] # Nova metadata port # Defaults to 8775 @@ -104,6 +108,7 @@ class neutron::plugins::plumgrid ( $identity_version = 'v3', $user_domain_name = 'Default', $nova_metadata_ip = '127.0.0.1', + $nova_metadata_host = '127.0.0.1', $nova_metadata_port = '8775', $nova_metadata_subnet = '127.0.0.1/24', $metadata_proxy_shared_secret = $::os_service_default, @@ -183,6 +188,7 @@ class neutron::plugins::plumgrid ( 'PLUMgridMetadata/enable_pg_metadata' : value => 'True'; 'PLUMgridMetadata/metadata_mode': value => 'local'; '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_subnet': value => $nova_metadata_subnet; 'PLUMgridMetadata/metadata_proxy_shared_secret': value => $metadata_proxy_shared_secret, secret =>true; diff --git a/releasenotes/notes/update_plumgrid_nova_metadata_host-7560036d9ab1d7ae.yaml b/releasenotes/notes/update_plumgrid_nova_metadata_host-7560036d9ab1d7ae.yaml new file mode 100644 index 000000000..009ccf628 --- /dev/null +++ b/releasenotes/notes/update_plumgrid_nova_metadata_host-7560036d9ab1d7ae.yaml @@ -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. diff --git a/spec/classes/neutron_plugins_plumgrid_spec.rb b/spec/classes/neutron_plugins_plumgrid_spec.rb index 22751bbb1..b4c2825e1 100644 --- a/spec/classes/neutron_plugins_plumgrid_spec.rb +++ b/spec/classes/neutron_plugins_plumgrid_spec.rb @@ -21,6 +21,7 @@ describe 'neutron::plugins::plumgrid' do :identity_version => 'v3', :user_domain_name => 'Default', :nova_metadata_ip => '127.0.0.1', + :nova_metadata_host => '127.0.0.1', :nova_metadata_port => '8775', :nova_metadata_subnet => '127.0.0.1/24', :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/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_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_subnet').with_value(params[:nova_metadata_subnet]) is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_proxy_shared_secret').with_value('').with_secret(true)