From 61d07624ce1e9eefa5c68c0d47cfd2d2d50096ac Mon Sep 17 00:00:00 2001 From: caoyuan Date: Sat, 12 May 2018 22:52:39 +0800 Subject: [PATCH] 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. This change updates the guide to be consistent with recent changes to the ubuntu packages: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/keystone/commit/?id=915d787af42096b0fad715e49759cd357e47787e Change-Id: I555e3559af1f8db9a14e0667969327ea06903c21 --- manifests/keystone/authtoken.pp | 4 ++-- spec/classes/aodh_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 10fb2c73..94d1ebea 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -14,7 +14,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 @@ -187,7 +187,7 @@ class aodh::keystone::authtoken( $username = 'aodh', $password = $::os_service_default, - $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/aodh_keystone_authtoken_spec.rb b/spec/classes/aodh_keystone_authtoken_spec.rb index 9ed92823..127e251c 100644 --- a/spec/classes/aodh_keystone_authtoken_spec.rb +++ b/spec/classes/aodh_keystone_authtoken_spec.rb @@ -13,7 +13,7 @@ describe 'aodh::keystone::authtoken' do it 'configure keystone_authtoken' do is_expected.to contain_aodh_config('keystone_authtoken/username').with_value('aodh') is_expected.to contain_aodh_config('keystone_authtoken/password').with_value('aodh_password') - is_expected.to contain_aodh_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') + is_expected.to contain_aodh_config('keystone_authtoken/auth_url').with_value('http://localhost:5000') is_expected.to contain_aodh_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_aodh_config('keystone_authtoken/user_domain_name').with_value('Default') is_expected.to contain_aodh_config('keystone_authtoken/project_domain_name').with_value('Default') @@ -53,7 +53,7 @@ describe 'aodh::keystone::authtoken' do :www_authenticate_uri => 'https://10.0.0.1:9999/', :username => 'myuser', :password => 'mypasswd', - :auth_url => 'http://:127.0.0.1:35357', + :auth_url => 'http://:127.0.0.1:5000', :project_name => 'service_project', :user_domain_name => 'domainX', :project_domain_name => 'domainX',