openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Deprecate API parameters from metadata agent"

changes/63/292163/3
Jenkins 2016-03-14 13:09:58 +00:00 committed by Gerrit Code Review
parent 0402147fe0 0b0a245764
commit e5a8ee35d9
2 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
manifests/agents/metadata.pp
View File

@ -4,9 +4,6 @@
#
# === Parameters
#
# [*auth_password*]
# (required) The password for the administrative user.
#
# [*shared_secret*]
# (required) Shared secret to validate proxies Neutron metadata requests.
#
@ -23,19 +20,6 @@
# [*debug*]
# Debug. Defaults to false.
#
# [*auth_tenant*]
# The administrative user's tenant name. Defaults to 'services'.
#
# [*auth_user*]
# The administrative user name for OpenStack Networking.
# Defaults to 'neutron'.
#
# [*auth_url*]
# The URL used to validate tokens. Defaults to 'http://localhost:35357/v2.0'.
#
# [*auth_insecure*]
# turn off verification of the certificate for ssl (Defaults to false)
#
# [*auth_ca_cert*]
# CA cert to check against with for ssl keystone. (Defaults to $::os_service_default)
#
@ -45,9 +29,6 @@
# [*nova_client_priv_key*]
# Private key of client certificate. (Defaults to $::os_service_default)
#
# [*auth_region*]
# The authentication region. (Defaults to $::os_service_default)
#
# [*metadata_ip*]
# The IP address of the metadata service. Defaults to $::os_service_default.
#
@ -75,20 +56,33 @@
# Set to 0 will cause cache entries to never expire.
# Set to $::os_service_default or false to disable cache.
#
# === Deprecated Parameters
# [*auth_password*]
# (required) The password for the administrative user (Defaults to undef).
#
# [*auth_tenant*]
# The administrative user's tenant name (Defaults to undef).
#
# [*auth_user*]
# The administrative user name for OpenStack Networking (Defaults to undef).
#
# [*auth_url*]
# The URL used to validate tokens (Defaults to undef).
#
# [*auth_insecure*]
# turn off verification of the certificate for ssl (Defaults to undef).
#
# [*auth_region*]
# The authentication region (Defaults to undef).
#
class neutron::agents::metadata (
$auth_password,
$shared_secret,
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$debug = false,
$auth_tenant = 'services',
$auth_user = 'neutron',
$auth_url = 'http://localhost:35357/v2.0',
$auth_insecure = false,
$auth_ca_cert = $::os_service_default,
$auth_region = $::os_service_default,
$metadata_ip = $::os_service_default,
$metadata_port = $::os_service_default,
$metadata_protocol = $::os_service_default,
@ -97,6 +91,13 @@ class neutron::agents::metadata (
$metadata_memory_cache_ttl = $::os_service_default,
$nova_client_cert = $::os_service_default,
$nova_client_priv_key = $::os_service_default,
# DEPRECATED PARAMETERS
$auth_password = undef,
$auth_tenant = undef,
$auth_user = undef,
$auth_url = undef,
$auth_insecure = undef,
$auth_region = undef,
) {
include ::neutron::params
@ -104,15 +105,33 @@ class neutron::agents::metadata (
Neutron_config<||> ~> Service['neutron-metadata']
Neutron_metadata_agent_config<||> ~> Service['neutron-metadata']
if $auth_password {
warning('The auth_password parameter is deprecated and was removed in Mitaka release.')
}
if $auth_tenant {
warning('The auth_tenant parameter is deprecated and was removed in Mitaka release.')
}
if $auth_user {
warning('The auth_user parameter is deprecated and was removed in Mitaka release.')
}
if $auth_url {
warning('The auth_url parameter is deprecated and was removed in Mitaka release.')
}
if $auth_insecure != undef {
warning('The auth_insecure parameter is deprecated and was removed in Mitaka release.')
}
if $auth_region {
warning('The auth_region parameter is deprecated and was removed in Mitaka release.')
}
neutron_metadata_agent_config {
'DEFAULT/debug': value => $debug;
'DEFAULT/auth_ca_cert': value => $auth_ca_cert;
'DEFAULT/auth_url': value => $auth_url;
'DEFAULT/auth_insecure': value => $auth_insecure;
'DEFAULT/auth_region': value => $auth_region;
'DEFAULT/admin_tenant_name': value => $auth_tenant;
'DEFAULT/admin_user': value => $auth_user;
'DEFAULT/admin_password': value => $auth_password, secret => true;
'DEFAULT/nova_metadata_ip': value => $metadata_ip;
'DEFAULT/nova_metadata_port': value => $metadata_port;
'DEFAULT/nova_metadata_protocol': value => $metadata_protocol;

24
spec/classes/neutron_agents_metadata_spec.rb
View File

@ -10,12 +10,6 @@ describe 'neutron::agents::metadata' do
{ :package_ensure => 'present',
:debug => false,
:enabled => true,
:auth_url => 'http://localhost:35357/v2.0',
:auth_insecure => false,
:auth_region => 'RegionOne',
:auth_tenant => 'services',
:auth_user => 'neutron',
:auth_password => 'password',
:shared_secret => 'metadata-secret',
}
end
@ -53,16 +47,9 @@ describe 'neutron::agents::metadata' do
it 'configures metadata_agent.ini' do
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/debug').with(:value => params[:debug])
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_url').with(:value => params[:auth_url])
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_insecure').with(:value => params[:auth_insecure])
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_ca_cert').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/nova_client_cert').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/nova_client_priv_key').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_region').with(:value => params[:auth_region])
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/admin_tenant_name').with(:value => params[:auth_tenant])
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/admin_user').with(:value => params[:auth_user])
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/admin_password').with(:value => params[:auth_password])
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/admin_password').with_secret( true )
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/nova_metadata_ip').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/nova_metadata_port').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/nova_metadata_protocol').with(:value => '<SERVICE DEFAULT>')
@ -73,11 +60,9 @@ describe 'neutron::agents::metadata' do
end
end
shared_examples_for 'neutron metadata agent with auth_insecure and auth_ca_cert set' do
shared_examples_for 'neutron metadata agent with auth_ca_cert set' do
let :params do
{ :auth_ca_cert => '/some/cert',
:auth_insecure => true,
:auth_password => 'blah',
:shared_secret => '42',
:nova_client_cert => '/nova/cert',
:nova_client_priv_key => '/nova/key',
@ -86,7 +71,6 @@ describe 'neutron::agents::metadata' do
it 'configures certificate' do
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_ca_cert').with_value('/some/cert')
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/auth_insecure').with_value('true')
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/nova_client_cert').with_value('/nova/cert')
is_expected.to contain_neutron_metadata_agent_config('DEFAULT/nova_client_priv_key').with_value('/nova/key')
end
@ -113,7 +97,7 @@ describe 'neutron::agents::metadata' do
end
it_configures 'neutron metadata agent'
it_configures 'neutron metadata agent with auth_insecure and auth_ca_cert set'
it_configures 'neutron metadata agent with auth_ca_cert set'
it 'configures subscription to neutron-metadata package' do
is_expected.to contain_service('neutron-metadata').that_subscribes_to('Package[neutron-metadata]')
end
@ -132,8 +116,6 @@ describe 'neutron::agents::metadata' do
end
it_configures 'neutron metadata agent'
it_configures 'neutron metadata agent with auth_insecure and auth_ca_cert set'
it_configures 'neutron metadata agent with auth_ca_cert set'
end
end