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: Id1253df00293fe3b2827cc115bce25c91d924d67
This commit is contained in:
parent
3b296efc89
commit
b81a91f2d8
|
@ -13,7 +13,7 @@
|
||||||
#
|
#
|
||||||
# [*auth_url*]
|
# [*auth_url*]
|
||||||
# (Optional) The URL to use for authentication.
|
# (Optional) The URL to use for authentication.
|
||||||
# Defaults to 'http://localhost:35357'
|
# Defaults to 'http://localhost:5000'
|
||||||
#
|
#
|
||||||
# [*project_name*]
|
# [*project_name*]
|
||||||
# (Optional) Service project name
|
# (Optional) Service project name
|
||||||
|
@ -186,7 +186,7 @@
|
||||||
class ec2api::keystone::authtoken(
|
class ec2api::keystone::authtoken(
|
||||||
$password,
|
$password,
|
||||||
$username = 'ec2api',
|
$username = 'ec2api',
|
||||||
$auth_url = 'http://localhost:35357',
|
$auth_url = 'http://localhost:5000',
|
||||||
$project_name = 'services',
|
$project_name = 'services',
|
||||||
$user_domain_name = 'Default',
|
$user_domain_name = 'Default',
|
||||||
$project_domain_name = 'Default',
|
$project_domain_name = 'Default',
|
||||||
|
|
|
@ -17,7 +17,7 @@ describe 'ec2api::keystone::authtoken' do
|
||||||
it 'configure keystone_authtoken' do
|
it 'configure keystone_authtoken' do
|
||||||
is_expected.to contain_ec2api_config('keystone_authtoken/username').with_value('ec2api')
|
is_expected.to contain_ec2api_config('keystone_authtoken/username').with_value('ec2api')
|
||||||
is_expected.to contain_ec2api_config('keystone_authtoken/password').with_value('ec2api_password')
|
is_expected.to contain_ec2api_config('keystone_authtoken/password').with_value('ec2api_password')
|
||||||
is_expected.to contain_ec2api_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
|
is_expected.to contain_ec2api_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
|
||||||
is_expected.to contain_ec2api_config('keystone_authtoken/project_name').with_value('services')
|
is_expected.to contain_ec2api_config('keystone_authtoken/project_name').with_value('services')
|
||||||
is_expected.to contain_ec2api_config('keystone_authtoken/user_domain_name').with_value('Default')
|
is_expected.to contain_ec2api_config('keystone_authtoken/user_domain_name').with_value('Default')
|
||||||
is_expected.to contain_ec2api_config('keystone_authtoken/project_domain_name').with_value('Default')
|
is_expected.to contain_ec2api_config('keystone_authtoken/project_domain_name').with_value('Default')
|
||||||
|
@ -57,7 +57,7 @@ describe 'ec2api::keystone::authtoken' do
|
||||||
:www_authenticate_uri => 'https://10.0.0.1:9999/',
|
:www_authenticate_uri => 'https://10.0.0.1:9999/',
|
||||||
:username => 'myuser',
|
:username => 'myuser',
|
||||||
:password => 'mypasswd',
|
:password => 'mypasswd',
|
||||||
:auth_url => 'http://:127.0.0.1:35357',
|
:auth_url => 'http://:127.0.0.1:5000',
|
||||||
:project_name => 'service_project',
|
:project_name => 'service_project',
|
||||||
:user_domain_name => 'domainX',
|
:user_domain_name => 'domainX',
|
||||||
:project_domain_name => 'domainX',
|
:project_domain_name => 'domainX',
|
||||||
|
|
Loading…
Reference in New Issue