openstack/puppet-neutron
Code Issues Proposed changes

Replace port 35357 with 5000 for "auth_url"

Browse Source 
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: I1fe3f2c90b2e51e8ada5aaddf02da5aeabcdbd7c
This commit is contained in:
huang.zhiping 2018-05-26 17:33:31 +08:00
parent 8d65a81163
commit bd82de5656
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/keystone/authtoken.pp
View File

@ -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 neutron::keystone::authtoken(
$username = 'neutron',
$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',

4
spec/classes/neutron_keystone_authtoken_spec.rb
View File

@ -13,7 +13,7 @@ describe 'neutron::keystone::authtoken' do
it 'configure keystone_authtoken' do
is_expected.to contain_neutron_config('keystone_authtoken/username').with_value('neutron')
is_expected.to contain_neutron_config('keystone_authtoken/password').with_value('neutron_password')
is_expected.to contain_neutron_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
is_expected.to contain_neutron_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
is_expected.to contain_neutron_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_neutron_config('keystone_authtoken/user_domain_name').with_value('Default')
is_expected.to contain_neutron_config('keystone_authtoken/project_domain_name').with_value('Default')
@ -53,7 +53,7 @@ describe 'neutron::keystone::authtoken' do
:www_authenticate_uri => 'https://10.0.0.1:9999/',
:username => 'myuser',
:password => 'mypasswd',
:auth_url => 'https://127.0.0.1:35357',
:auth_url => 'https://127.0.0.1:5000',
:project_name => 'service_project',
:user_domain_name => 'domainX',
:project_domain_name => 'domainX',