From d03c7d6ee66e962749df07f897339a68b7dff846 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Wed, 18 Jul 2018 10:29:24 +0200 Subject: [PATCH] Replace port 35357 with 5000 Change-Id: I981e0545bb0722b324ae792c82601f7b0534ae49 --- manifests/keystone/authtoken.pp | 4 ++-- manifests/keystone/trust.pp | 4 ++-- spec/classes/zaqar_keystone_authtoken_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index ff02642..943aaba 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 zaqar::keystone::authtoken( $username = 'zaqar', $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/manifests/keystone/trust.pp b/manifests/keystone/trust.pp index 9f9fd58..9ad6966 100644 --- a/manifests/keystone/trust.pp +++ b/manifests/keystone/trust.pp @@ -14,7 +14,7 @@ # # [*auth_url*] # (Optional) The URL to use for authentication. -# Defaults to 'http://localhost:35357' +# Defaults to 'http://localhost:5000' # # [*user_domain_name*] # (Optional) Name of domain for $username @@ -31,7 +31,7 @@ class zaqar::keystone::trust( $username = 'zaqar', $password = $::os_service_default, - $auth_url = 'http://localhost:35357', + $auth_url = 'http://localhost:5000', $user_domain_name = 'Default', $auth_section = $::os_service_default, $auth_type = 'password', diff --git a/spec/classes/zaqar_keystone_authtoken_spec.rb b/spec/classes/zaqar_keystone_authtoken_spec.rb index 6b57e4a..6ae1201 100644 --- a/spec/classes/zaqar_keystone_authtoken_spec.rb +++ b/spec/classes/zaqar_keystone_authtoken_spec.rb @@ -13,7 +13,7 @@ describe 'zaqar::keystone::authtoken' do it 'configure keystone_authtoken' do is_expected.to contain_zaqar_config('keystone_authtoken/username').with_value('zaqar') is_expected.to contain_zaqar_config('keystone_authtoken/password').with_value('zaqar_password') - is_expected.to contain_zaqar_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') + is_expected.to contain_zaqar_config('keystone_authtoken/auth_url').with_value('http://localhost:5000') is_expected.to contain_zaqar_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_zaqar_config('keystone_authtoken/user_domain_name').with_value('Default') is_expected.to contain_zaqar_config('keystone_authtoken/project_domain_name').with_value('Default') @@ -53,7 +53,7 @@ describe 'zaqar::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',