openstack
/
puppet-designate
Code Issues Proposed changes

Merge "Replace port 35357 with 5000"

This commit is contained in:
Zuul 2018-05-30 05:13:48 +00:00 committed by Gerrit Code Review
parent 25f07ee1e1 1823d64da9
commit 061be58267
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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
@ -192,7 +192,7 @@
class designate::keystone::authtoken( class designate::keystone::authtoken(
$username = 'designate', $username = 'designate',
$password = $::os_service_default, $password = $::os_service_default,
$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',

4
spec/classes/designate_keystone_authtoken_spec.rb
View File

@ -13,7 +13,7 @@ describe 'designate::keystone::authtoken' do
it 'configure keystone_authtoken' do it 'configure keystone_authtoken' do
is_expected.to contain_designate_config('keystone_authtoken/username').with_value('designate') is_expected.to contain_designate_config('keystone_authtoken/username').with_value('designate')
is_expected.to contain_designate_config('keystone_authtoken/password').with_value('designate_password') is_expected.to contain_designate_config('keystone_authtoken/password').with_value('designate_password')
is_expected.to contain_designate_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') is_expected.to contain_designate_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
is_expected.to contain_designate_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_designate_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_designate_config('keystone_authtoken/user_domain_name').with_value('Default') is_expected.to contain_designate_config('keystone_authtoken/user_domain_name').with_value('Default')
is_expected.to contain_designate_config('keystone_authtoken/project_domain_name').with_value('Default') is_expected.to contain_designate_config('keystone_authtoken/project_domain_name').with_value('Default')
@ -53,7 +53,7 @@ describe 'designate::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 => 'https://127.0.0.1:35357', :auth_url => 'https://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',