openstack/puppet-watcher
Code Issues Proposed changes

Add watcher_clients_auth user_domain_name config

Browse Source 
This parameter is required to communicate to keystone
v3.

Change-Id: Ia63846b7df96b2c063ca40dd1f56129530ec39d7
This commit is contained in:
yatin 2019-03-13 14:31:30 +05:30
parent 2cf783b70f
commit faf3360660
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/api.pp
View File

@ -89,6 +89,10 @@
# (Optional) Domain name containing project.
# Defaults to undef
#
# [*watcher_client_user_domain_name*]
# (Optional) User Domain name.
# Defaults to undef
#
# [*watcher_client_insecure*]
# (Optional) Verify HTTPS connections.
# Defaults to undef
@ -154,6 +158,7 @@ class watcher::api (
$watcher_client_certfile = $::os_service_default,
$watcher_client_cafile = $::os_service_default,
$watcher_client_project_domain_name = $::os_service_default,
$watcher_client_user_domain_name = $::os_service_default,
$watcher_client_insecure = $::os_service_default,
$watcher_client_keyfile = $::os_service_default,
$watcher_client_auth_type = 'password',
@ -246,6 +251,7 @@ as a standalone service, or httpd for being run by a httpd server")
'watcher_clients_auth/auth_uri': value => $watcher_client_auth_uri;
'watcher_clients_auth/project_name': value => $watcher_client_project_name;
'watcher_clients_auth/project_domain_name': value => $watcher_client_project_domain_name;
'watcher_clients_auth/user_domain_name': value => $watcher_client_user_domain_name;
'watcher_clients_auth/insecure': value => $watcher_client_insecure;
'watcher_clients_auth/auth_type': value => $watcher_client_auth_type;
'watcher_clients_auth/cafile': value => $watcher_client_cafile;

5
releasenotes/notes/add-user-domain-name-config-56c23698d3306ad0.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Add [watcher_clients_auth]/user_domain_name config parameter,
this parameter is required to communicate to keystone v3.

3
spec/classes/watcher_api_spec.rb
View File

@ -97,6 +97,7 @@ describe 'watcher::api' do
is_expected.to contain_watcher_config('watcher_clients_auth/auth_uri').with_value('http://localhost:5000/')
is_expected.to contain_watcher_config('watcher_clients_auth/project_name').with_value('service')
is_expected.to contain_watcher_config('watcher_clients_auth/project_domain_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_watcher_config('watcher_clients_auth/user_domain_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_watcher_config('watcher_clients_auth/insecure').with_value('<SERVICE DEFAULT>')
is_expected.to contain_watcher_config('watcher_clients_auth/auth_type').with_value('password')
is_expected.to contain_watcher_config('watcher_clients_auth/cafile').with_value('<SERVICE DEFAULT>')
@ -114,6 +115,7 @@ describe 'watcher::api' do
:watcher_client_auth_url => 'http://localhost:35358/',
:watcher_client_project_name => 'ProjectZero',
:watcher_client_project_domain_name => 'WatcherDomain',
:watcher_client_user_domain_name => 'WatcherUserDomain',
:watcher_client_insecure => 'true',
:watcher_client_auth_type => 'password',
:watcher_client_cafile => '/tmp/ca.crt',
@ -128,6 +130,7 @@ describe 'watcher::api' do
is_expected.to contain_watcher_config('watcher_clients_auth/auth_url').with_value('http://localhost:35358/')
is_expected.to contain_watcher_config('watcher_clients_auth/project_name').with_value( params[:watcher_client_project_name] )
is_expected.to contain_watcher_config('watcher_clients_auth/project_domain_name').with_value( params[:watcher_client_project_domain_name] )
is_expected.to contain_watcher_config('watcher_clients_auth/user_domain_name').with_value( params[:watcher_client_user_domain_name] )
is_expected.to contain_watcher_config('watcher_clients_auth/insecure').with_value( params[:watcher_client_insecure] )
is_expected.to contain_watcher_config('watcher_clients_auth/auth_type').with_value( params[:watcher_client_auth_type] )
is_expected.to contain_watcher_config('watcher_clients_auth/cafile').with_value( params[:watcher_client_cafile] )