summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-05-30 05:13:48 +0000
committerGerrit Code Review <review@openstack.org>2018-05-30 05:13:48 +0000
commit061be58267ee5990a986a9477c5055fc386ae81c (patch)
treea29147ebd98f1f1bbb6c4fbd2df660308b6b7ad0
parent25f07ee1e1f440e90f550acbc129ef0f0d6f2263 (diff)
parent1823d64da90e0f5b550050e1300abba907069b8b (diff)
Merge "Replace port 35357 with 5000"
-rw-r--r--manifests/keystone/authtoken.pp4
-rw-r--r--spec/classes/designate_keystone_authtoken_spec.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 793294a..45348fc 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -14,7 +14,7 @@
14# 14#
15# [*auth_url*] 15# [*auth_url*]
16# (Optional) The URL to use for authentication. 16# (Optional) The URL to use for authentication.
17# Defaults to 'http://localhost:35357'. 17# Defaults to 'http://localhost:5000'.
18# 18#
19# [*project_name*] 19# [*project_name*]
20# (Optional) Service project name 20# (Optional) Service project name
@@ -192,7 +192,7 @@
192class designate::keystone::authtoken( 192class designate::keystone::authtoken(
193 $username = 'designate', 193 $username = 'designate',
194 $password = $::os_service_default, 194 $password = $::os_service_default,
195 $auth_url = 'http://localhost:35357', 195 $auth_url = 'http://localhost:5000',
196 $project_name = 'services', 196 $project_name = 'services',
197 $user_domain_name = 'Default', 197 $user_domain_name = 'Default',
198 $project_domain_name = 'Default', 198 $project_domain_name = 'Default',
diff --git a/spec/classes/designate_keystone_authtoken_spec.rb b/spec/classes/designate_keystone_authtoken_spec.rb
index dbd78b4..6b320f7 100644
--- a/spec/classes/designate_keystone_authtoken_spec.rb
+++ b/spec/classes/designate_keystone_authtoken_spec.rb
@@ -13,7 +13,7 @@ describe 'designate::keystone::authtoken' do
13 it 'configure keystone_authtoken' do 13 it 'configure keystone_authtoken' do
14 is_expected.to contain_designate_config('keystone_authtoken/username').with_value('designate') 14 is_expected.to contain_designate_config('keystone_authtoken/username').with_value('designate')
15 is_expected.to contain_designate_config('keystone_authtoken/password').with_value('designate_password') 15 is_expected.to contain_designate_config('keystone_authtoken/password').with_value('designate_password')
16 is_expected.to contain_designate_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') 16 is_expected.to contain_designate_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
17 is_expected.to contain_designate_config('keystone_authtoken/project_name').with_value('services') 17 is_expected.to contain_designate_config('keystone_authtoken/project_name').with_value('services')
18 is_expected.to contain_designate_config('keystone_authtoken/user_domain_name').with_value('Default') 18 is_expected.to contain_designate_config('keystone_authtoken/user_domain_name').with_value('Default')
19 is_expected.to contain_designate_config('keystone_authtoken/project_domain_name').with_value('Default') 19 is_expected.to contain_designate_config('keystone_authtoken/project_domain_name').with_value('Default')
@@ -53,7 +53,7 @@ describe 'designate::keystone::authtoken' do
53 :www_authenticate_uri => 'https://10.0.0.1:9999/', 53 :www_authenticate_uri => 'https://10.0.0.1:9999/',
54 :username => 'myuser', 54 :username => 'myuser',
55 :password => 'mypasswd', 55 :password => 'mypasswd',
56 :auth_url => 'https://127.0.0.1:35357', 56 :auth_url => 'https://127.0.0.1:5000',
57 :project_name => 'service_project', 57 :project_name => 'service_project',
58 :user_domain_name => 'domainX', 58 :user_domain_name => 'domainX',
59 :project_domain_name => 'domainX', 59 :project_domain_name => 'domainX',