From 6afae87cf188b77bf6d15059d4487a4c30ba751d Mon Sep 17 00:00:00 2001 From: melissaml Date: Mon, 21 May 2018 14:50:53 +0800 Subject: [PATCH] Replace port 35357 with 5000 for "auth_url" Based on the change in Keystone Install Guide [1], this patch replace port 35357 with 5000 for "auth_url". For more details, please check similar changes which have been done on other projects: Nova [2], Neutron [3], Cinder [4], Glance [5]. [1] https://review.openstack.org/#/c/541857 [2] https://review.openstack.org/#/c/562812 [3] https://review.openstack.org/#/c/566491 [4] https://review.openstack.org/#/c/565464 [5] https://review.openstack.org/#/c/558932 Change-Id: I4663576274830a7d6fa0b1a06d357cae58c771c7 --- manifests/keystone/authtoken.pp | 4 ++-- spec/classes/glare_keystone_authtoken_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index e569a2a..b0e8846 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -13,7 +13,7 @@ # # [*auth_url*] # (Optional) The URL to use for authentication. -# Defaults to 'http://localhost:35357'. +# Defaults to 'http://localhost:5000'. # # [*project_name*] # (Optional) Service project name @@ -186,7 +186,7 @@ class glare::keystone::authtoken( $password, $username = 'glare', - $auth_url = 'http://localhost:35357', + $auth_url = 'http://localhost:5000', $project_name = 'services', $user_domain_name = 'Default', $project_domain_name = 'Default', diff --git a/spec/classes/glare_keystone_authtoken_spec.rb b/spec/classes/glare_keystone_authtoken_spec.rb index b66ea4a..8e18395 100644 --- a/spec/classes/glare_keystone_authtoken_spec.rb +++ b/spec/classes/glare_keystone_authtoken_spec.rb @@ -13,7 +13,7 @@ describe 'glare::keystone::authtoken' do it 'configure keystone_authtoken' do is_expected.to contain_glare_config('keystone_authtoken/username').with_value('glare') is_expected.to contain_glare_config('keystone_authtoken/password').with_value('secrete') - is_expected.to contain_glare_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') + is_expected.to contain_glare_config('keystone_authtoken/auth_url').with_value('http://localhost:5000') is_expected.to contain_glare_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_glare_config('keystone_authtoken/user_domain_name').with_value('Default') is_expected.to contain_glare_config('keystone_authtoken/project_domain_name').with_value('Default') @@ -53,7 +53,7 @@ describe 'glare::keystone::authtoken' do :www_authenticate_uri => 'https://10.0.0.1:9999/', :username => 'myuser', :password => 'mypasswd', - :auth_url => 'https://127.0.0.1:35357', + :auth_url => 'https://127.0.0.1:5000', :project_name => 'service_project', :user_domain_name => 'domainX', :project_domain_name => 'domainX',