openstack/puppet-octavia
Code Issues Proposed changes

Add auth_type parameter to service_auth section

Browse Source 
Add parameter to allow setting auth_type.

Change-Id: I712db2e7310ba32cb68a7266c6b563ab3f4ab8cf
This commit is contained in:
Brent Eagles 2017-12-12 12:20:38 -03:30
parent a5e4f235d1
commit 8cb1a195e4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/service_auth.pp
View File

@ -27,6 +27,10 @@
# (optional) keystone project domain # (optional) keystone project domain
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*auth_type*]
# (optional) keystone authentication type
# Defaults to $::os_service_default
#
class octavia::service_auth ( class octavia::service_auth (
$auth_url = $::os_service_default, $auth_url = $::os_service_default,
@ -35,6 +39,7 @@ class octavia::service_auth (
$password = $::os_service_default, $password = $::os_service_default,
$user_domain_name = $::os_service_default, $user_domain_name = $::os_service_default,
$project_domain_name = $::os_service_default, $project_domain_name = $::os_service_default,
$auth_type = $::os_service_default,
) { ) {
include ::octavia::deps include ::octavia::deps
@ -46,5 +51,6 @@ class octavia::service_auth (
'service_auth/password' : value => $password; 'service_auth/password' : value => $password;
'service_auth/user_domain_name' : value => $user_domain_name; 'service_auth/user_domain_name' : value => $user_domain_name;
'service_auth/project_domain_name' : value => $project_domain_name; 'service_auth/project_domain_name' : value => $project_domain_name;
'service_auth/auth_type' : value => $auth_type;
} }
} }

5
spec/classes/octavia_service_auth_spec.rb
View File

@ -11,6 +11,7 @@ describe 'octavia::service_auth' do
is_expected.to contain_octavia_config('service_auth/password').with_value('<SERVICE DEFAULT>') is_expected.to contain_octavia_config('service_auth/password').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('service_auth/user_domain_name').with_value('<SERVICE DEFAULT>') is_expected.to contain_octavia_config('service_auth/user_domain_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('service_auth/project_domain_name').with_value('<SERVICE DEFAULT>') is_expected.to contain_octavia_config('service_auth/project_domain_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('service_auth/auth_type').with_value('<SERVICE DEFAULT>')
end end
end end
@ -21,7 +22,8 @@ describe 'octavia::service_auth' do
:project_name => 'some_project_name', :project_name => 'some_project_name',
:password => 'secure123', :password => 'secure123',
:user_domain_name => 'my_domain_name', :user_domain_name => 'my_domain_name',
:project_domain_name => 'our_domain_name' :project_domain_name => 'our_domain_name',
:auth_type => 'password',
} }
end end
@ -32,6 +34,7 @@ describe 'octavia::service_auth' do
is_expected.to contain_octavia_config('service_auth/password').with_value('secure123') is_expected.to contain_octavia_config('service_auth/password').with_value('secure123')
is_expected.to contain_octavia_config('service_auth/user_domain_name').with_value('my_domain_name') is_expected.to contain_octavia_config('service_auth/user_domain_name').with_value('my_domain_name')
is_expected.to contain_octavia_config('service_auth/project_domain_name').with_value('our_domain_name') is_expected.to contain_octavia_config('service_auth/project_domain_name').with_value('our_domain_name')
is_expected.to contain_octavia_config('service_auth/auth_type').with_value('password')
end end
end end
end end