openstack
/
puppet-neutron
Code Issues Proposed changes

Added user_domain_name and project_domain_name for nova notifications 

A few parameters missed in neutron::server::notifications and
there were configured with default params.

Fixed conflicts

Change-Id: Ibbdf145107991b08e1a3802dd861597b33bb7a5a
(cherry picked from commit I642fec707a669a724961dd0dd900d28522b8f869)
This commit is contained in:
Daniel Pawlik 2017-02-21 16:20:39 +00:00
parent 374d1a3c4f
commit 628fc95121
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/server/notifications.pp
View File

@ -55,6 +55,10 @@
# (optional) Nova project's domain ID
# Defaults to 'default'
#
# [*project_domain_name*]
# (Optional) Name of domain for $project_name
# Defaults to 'Default'
#
# [*project_name*]
# (optional) Nova project's name
# Defaults to 'services'
@ -63,6 +67,10 @@
# (optional) User's domain ID for connection to nova in admin context
# Defaults to 'default'
#
# [*user_domain_name*]
# (Optional) Name of domain for $username
# Defaults to 'Default'
#
# [*auth_url*]
# (optional) Authorization URL for connection to nova in admin context.
# If version independent identity plugin is used available versions will be
@ -128,8 +136,10 @@ class neutron::server::notifications (
$tenant_id = $::os_service_default,
$tenant_name = 'services',
$project_domain_id = 'default',
$project_domain_name = 'Default',
$project_name = 'services',
$user_domain_id = 'default',
$user_domain_name = 'Default',
$auth_url = 'http://127.0.0.1:35357',
$region_name = $::os_service_default,
# DEPRECATED PARAMETERS
@ -188,13 +198,15 @@ class neutron::server::notifications (
if $password {
neutron_config {
'nova/auth_url': value => $auth_url;
'nova/username': value => $username;
'nova/password': value => $password, secret => true;
'nova/project_domain_id': value => $project_domain_id;
'nova/project_name': value => $project_name;
'nova/user_domain_id': value => $user_domain_id;
'nova/region_name': value => $region_name;
'nova/auth_url': value => $auth_url;
'nova/username': value => $username;
'nova/password': value => $password, secret => true;
'nova/project_domain_id': value => $project_domain_id;
'nova/project_domain_name': value => $project_domain_name;
'nova/project_name': value => $project_name;
'nova/user_domain_id': value => $user_domain_id;
'nova/user_domain_name': value => $user_domain_name;
'nova/region_name': value => $region_name;
}
if ! is_service_default ($auth_plugin) and ($auth_plugin) {
warning('auth_plugin parameter is deprecated, auth_type should be used instead')

16
spec/classes/neutron_server_notifications_spec.rb
View File

@ -28,8 +28,10 @@ describe 'neutron::server::notifications' do
:username => 'nova',
:tenant_name => 'services',
:project_domain_id => 'default',
:project_domain_name => 'Default',
:project_name => 'services',
:user_domain_id => 'default',
:user_domain_name => 'Default',
:auth_url => 'http://127.0.0.1:35357',
:nova_admin_auth_url => 'http://127.0.0.1:35357/v2.0',
:nova_admin_username => 'nova',
@ -71,6 +73,10 @@ describe 'neutron::server::notifications' do
is_expected.not_to contain_neutron_config('DEFAULT/nova_admin_password')
is_expected.not_to contain_neutron_config('DEFAULT/nova_admin_password')
is_expected.not_to contain_neutron_config('DEFAULT/nova_admin_tenant_id')
is_expected.to contain_neutron_config('nova/project_domain_id').with_value('default')
is_expected.to contain_neutron_config('nova/project_domain_name').with_value('Default')
is_expected.to contain_neutron_config('nova/user_domain_id').with_value('default')
is_expected.to contain_neutron_config('nova/user_domain_name').with_value('Default')
is_expected.not_to contain_neutron_config('nova/auth_plugin')
end
@ -85,7 +91,11 @@ describe 'neutron::server::notifications' do
:auth_type => 'v2password',
:username => 'joe',
:region_name => 'MyRegion',
:tenant_id => 'UUID2'
:tenant_id => 'UUID2',
:project_domain_id => 'default_1',
:project_domain_name => 'Default_2',
:user_domain_id => 'default_3',
:user_domain_name => 'Default_4',
)
end
it 'should configure neutron server with overrided parameters' do
@ -100,6 +110,10 @@ describe 'neutron::server::notifications' do
is_expected.to contain_neutron_config('nova/password').with_secret( true )
is_expected.to contain_neutron_config('nova/region_name').with_value('MyRegion')
is_expected.to contain_neutron_config('nova/tenant_id').with_value('UUID2')
is_expected.to contain_neutron_config('nova/project_domain_id').with_value('default_1')
is_expected.to contain_neutron_config('nova/project_domain_name').with_value('Default_2')
is_expected.to contain_neutron_config('nova/user_domain_id').with_value('default_3')
is_expected.to contain_neutron_config('nova/user_domain_name').with_value('Default_4')
end
end