From dee7ac93b1b7cb4433cdc687d33a553c1a053710 Mon Sep 17 00:00:00 2001 From: qiaomin Date: Sun, 13 May 2018 00:43:30 +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: I159c7ba3b158e1e6ca8fce8bf971f1138d058a46 --- manifests/keystone/authtoken.pp | 4 ++-- spec/classes/mistral_init_spec.rb | 2 +- spec/classes/mistral_keystone_authtoken_spec.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 29d4fc4..ed5e80d 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 mistral::keystone::authtoken( $username = 'mistral', $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/mistral_init_spec.rb b/spec/classes/mistral_init_spec.rb index aa616a2..5a2b2ee 100644 --- a/spec/classes/mistral_init_spec.rb +++ b/spec/classes/mistral_init_spec.rb @@ -57,7 +57,7 @@ describe 'mistral' do :value => 'http://localhost:5000' ) is_expected.to contain_mistral_config('keystone_authtoken/auth_url').with( - :value => 'http://localhost:35357' + :value => 'http://localhost:5000' ) is_expected.to contain_mistral_config('keystone_authtoken/project_name').with( :value => 'services' diff --git a/spec/classes/mistral_keystone_authtoken_spec.rb b/spec/classes/mistral_keystone_authtoken_spec.rb index b43b472..f11b53c 100644 --- a/spec/classes/mistral_keystone_authtoken_spec.rb +++ b/spec/classes/mistral_keystone_authtoken_spec.rb @@ -13,7 +13,7 @@ describe 'mistral::keystone::authtoken' do it 'configure keystone_authtoken' do is_expected.to contain_mistral_config('keystone_authtoken/username').with_value('mistral') is_expected.to contain_mistral_config('keystone_authtoken/password').with_value('mistral_password') - is_expected.to contain_mistral_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') + is_expected.to contain_mistral_config('keystone_authtoken/auth_url').with_value('http://localhost:5000') is_expected.to contain_mistral_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_mistral_config('keystone_authtoken/user_domain_name').with_value('Default') is_expected.to contain_mistral_config('keystone_authtoken/project_domain_name').with_value('Default') @@ -53,7 +53,7 @@ describe 'mistral::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',