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
This commit is contained in:
parent
8bd5ec7194
commit
61d07624ce
@ -14,7 +14,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
|
||||||
@ -187,7 +187,7 @@
|
|||||||
class aodh::keystone::authtoken(
|
class aodh::keystone::authtoken(
|
||||||
$username = 'aodh',
|
$username = 'aodh',
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
$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',
|
||||||
|
@ -13,7 +13,7 @@ describe 'aodh::keystone::authtoken' do
|
|||||||
it 'configure 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/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/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/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/user_domain_name').with_value('Default')
|
||||||
is_expected.to contain_aodh_config('keystone_authtoken/project_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/',
|
: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
Block a user