From fa57613789f3d93d45346fac12c36a62713e0459 Mon Sep 17 00:00:00 2001 From: qiaomin Date: Sun, 13 May 2018 00:36:48 +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. Change-Id: I168b731b37a714500a5600d0f5f95e229efa25fd --- manifests/keystone/authtoken.pp | 4 ++-- spec/classes/magnum_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 dc71147..a98eb7f 100755 --- 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 @@ -183,7 +183,7 @@ class magnum::keystone::authtoken( $password, $username = 'magnum', - $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/magnum_keystone_authtoken_spec.rb b/spec/classes/magnum_keystone_authtoken_spec.rb index 22007b0..f0b2561 100755 --- a/spec/classes/magnum_keystone_authtoken_spec.rb +++ b/spec/classes/magnum_keystone_authtoken_spec.rb @@ -17,7 +17,7 @@ describe 'magnum::keystone::authtoken' do it 'configure keystone_authtoken' do is_expected.to contain_magnum_config('keystone_authtoken/username').with_value('magnum') is_expected.to contain_magnum_config('keystone_authtoken/password').with_value('magnum_password') - is_expected.to contain_magnum_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') + is_expected.to contain_magnum_config('keystone_authtoken/auth_url').with_value('http://localhost:5000') is_expected.to contain_magnum_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_magnum_config('keystone_authtoken/admin_user').with_value('magnum') is_expected.to contain_magnum_config('keystone_authtoken/admin_password').with_value('magnum_password') @@ -60,7 +60,7 @@ describe 'magnum::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',