openstack
/
puppet-watcher
Code Issues Proposed changes

Replace port 35357 with 5000 

Now that the v2.0 API has been removed, we don't have a reason to
include deployment instructions for two separate applications on
different ports.

Change-Id: Ic1d30e49dc878f997c4d8e0eb228b2e80da578c0
This commit is contained in:
qiaomin 2018-05-13 00:55:24 +08:00
parent 7d94b4b6f3
commit 60982ee75f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api.pp
View File

@ -23,7 +23,7 @@
# #
# [*watcher_client_auth_url*] # [*watcher_client_auth_url*]
# Specifies the admin Identity URI for Watcher to use. # Specifies the admin Identity URI for Watcher to use.
# Default 'http://localhost:35357/' # Default 'http://localhost:5000/'
# #
# [*package_ensure*] # [*package_ensure*]
# (Optional)Ensure state of the openstackclient package. # (Optional)Ensure state of the openstackclient package.
@ -139,7 +139,7 @@ class watcher::api (
$watcher_client_password, $watcher_client_password,
$watcher_client_username = 'watcher', $watcher_client_username = 'watcher',
$watcher_client_auth_uri = 'http://localhost:5000/', $watcher_client_auth_uri = 'http://localhost:5000/',
$watcher_client_auth_url = 'http://localhost:35357/', $watcher_client_auth_url = 'http://localhost:5000/',
$package_ensure = 'present', $package_ensure = 'present',
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,

4
manifests/keystone/authtoken.pp
View File

@ -14,7 +14,7 @@
# #
# [*auth_url*] # [*auth_url*]
# (Optional) The URL to use for authentication. # (Optional) The URL to use for authentication.
# Defaults to 'http://localhost:35357' # Defaults to 'http://localhost:5000'
# #
# [*project_name*] # [*project_name*]
# (Optional) Service project name # (Optional) Service project name
@ -189,7 +189,7 @@
class watcher::keystone::authtoken ( class watcher::keystone::authtoken (
$password = $::os_service_default, $password = $::os_service_default,
$username = 'watcher', $username = 'watcher',
$auth_url = 'http://localhost:35357', $auth_url = 'http://localhost:5000',
$project_name = 'services', $project_name = 'services',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',

2
spec/classes/watcher_api_spec.rb
View File

@ -93,7 +93,7 @@ describe 'watcher::api' do
it 'configures watcher clients auth' do it 'configures watcher clients auth' do
is_expected.to contain_watcher_config('watcher_clients_auth/username').with_value('watcher') is_expected.to contain_watcher_config('watcher_clients_auth/username').with_value('watcher')
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:35357/') 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('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/project_domain_name').with_value('<SERVICE DEFAULT>')

4
spec/classes/watcher_keystone_authtoken_spec.rb
View File

@ -17,7 +17,7 @@ describe 'watcher::keystone::authtoken' do
it 'configure keystone_authtoken' do it 'configure keystone_authtoken' do
is_expected.to contain_watcher_config('keystone_authtoken/username').with_value('watcher') is_expected.to contain_watcher_config('keystone_authtoken/username').with_value('watcher')
is_expected.to contain_watcher_config('keystone_authtoken/password').with_value('watcher_password') is_expected.to contain_watcher_config('keystone_authtoken/password').with_value('watcher_password')
is_expected.to contain_watcher_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') is_expected.to contain_watcher_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
is_expected.to contain_watcher_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_watcher_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_watcher_config('keystone_authtoken/user_domain_name').with_value('Default') is_expected.to contain_watcher_config('keystone_authtoken/user_domain_name').with_value('Default')
is_expected.to contain_watcher_config('keystone_authtoken/project_domain_name').with_value('Default') is_expected.to contain_watcher_config('keystone_authtoken/project_domain_name').with_value('Default')
@ -57,7 +57,7 @@ describe 'watcher::keystone::authtoken' do
:www_authenticate_uri => 'https://10.0.0.1:9999/', :www_authenticate_uri => 'https://10.0.0.1:9999/',
:username => 'myuser', :username => 'myuser',
:password => 'mypasswd', :password => 'mypasswd',
:auth_url => 'http://:127.0.0.1:35357', :auth_url => 'http://:127.0.0.1:5000',
:project_name => 'service_project', :project_name => 'service_project',
:user_domain_name => 'domainX', :user_domain_name => 'domainX',
:project_domain_name => 'domainX', :project_domain_name => 'domainX',