openstack/puppet-watcher
Code Issues Proposed changes

Change watcher_client_project_name default value to services

Browse Source 
The default project in keystone is named services. In order to keep
it consistent, the default value of project_name is changed to services.

Change-Id: I615989da04d074eb948451ef8d1271f3575bd71c
This commit is contained in:
ZhongShengping 2019-03-15 09:24:31 +08:00
parent e971d73af8
commit 5dea6e9b2a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api.pp
View File

@ -74,7 +74,7 @@
# #
# [*watcher_client_project_name*] # [*watcher_client_project_name*]
# (Optional) Service project name. # (Optional) Service project name.
# Defaults to 'service' # Defaults to 'services'
# #
# [*watcher_client_certfile*] # [*watcher_client_certfile*]
# (Optional) PEM encoded client certificate cert file. # (Optional) PEM encoded client certificate cert file.
@ -154,7 +154,7 @@ class watcher::api (
$watcher_api_workers = $::os_workers, $watcher_api_workers = $::os_workers,
$watcher_api_enable_ssl_api = $::os_service_default, $watcher_api_enable_ssl_api = $::os_service_default,
$watcher_client_default_domain_name = $::os_service_default, $watcher_client_default_domain_name = $::os_service_default,
$watcher_client_project_name = 'service', $watcher_client_project_name = 'services',
$watcher_client_certfile = $::os_service_default, $watcher_client_certfile = $::os_service_default,
$watcher_client_cafile = $::os_service_default, $watcher_client_cafile = $::os_service_default,
$watcher_client_project_domain_name = $::os_service_default, $watcher_client_project_domain_name = $::os_service_default,

4
releasenotes/notes/update_watcher_client_project_name-abd703bec044d78d.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- The default value for watcher::api::watcher_client_project_name is
changed to 'services'.

2
spec/classes/watcher_api_spec.rb
View File

@ -95,7 +95,7 @@ describe 'watcher::api' do
is_expected.to contain_watcher_config('watcher_clients_auth/password').with_value( params[:watcher_client_password] ) is_expected.to contain_watcher_config('watcher_clients_auth/password').with_value( params[:watcher_client_password] )
is_expected.to contain_watcher_config('watcher_clients_auth/auth_url').with_value('http://localhost:5000/') is_expected.to contain_watcher_config('watcher_clients_auth/auth_url').with_value('http://localhost:5000/')
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/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_name').with_value('services')
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/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/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/insecure').with_value('<SERVICE DEFAULT>')