openstack
/
puppet-openstack_extras
Code Issues Proposed changes

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: Idaf125a35d36d82b6861930ccb6b9c1dc9231eaf
This commit is contained in:
Nguyen Van Duc 2018-07-18 15:15:14 +07:00
parent bfd1c9a8d5
commit 4e6d741889
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/auth_file.pp
View File

@ -22,7 +22,7 @@
#
# [*service_endpoint*]
# (optional) Keystone service endpoint
# Defaults to 'http://127.0.0.1:35357/v3/'
# Defaults to 'http://127.0.0.1:5000/v3/'
#
# [*username*]
# (optional) Username for this account as defined in keystone
@ -122,7 +122,7 @@ class openstack_extras::auth_file(
$password = undef,
$auth_url = 'http://127.0.0.1:5000/v3/',
$service_token = undef,
$service_endpoint = 'http://127.0.0.1:35357/v3/',
$service_endpoint = 'http://127.0.0.1:5000/v3/',
$username = 'admin',
$tenant_name = undef,
$project_name = 'openstack',

4
spec/classes/openstack_extras_auth_file_spec.rb
View File

@ -38,7 +38,7 @@ describe 'openstack_extras::auth_file' do
:password => 'admin',
:auth_url => 'http://127.0.0.2:5000/v3/',
:service_token => 'servicetoken',
:service_endpoint => 'http://127.0.0.2:35357/v3/',
:service_endpoint => 'http://127.0.0.2:5000/v3/',
:username => 'myuser',
:tenant_name => 'mytenant',
:project_name => 'myproject',
@ -66,7 +66,7 @@ describe 'openstack_extras::auth_file' do
it 'should create a openrc file' do
verify_contents(catalogue, '/root/openrc', [
'export OS_SERVICE_TOKEN=\'servicetoken\'',
'export OS_SERVICE_ENDPOINT=\'http://127.0.0.2:35357/v3/\'',
'export OS_SERVICE_ENDPOINT=\'http://127.0.0.2:5000/v3/\'',
'export OS_NO_CACHE=\'false\'',
'export OS_TENANT_NAME=\'mytenant\'',
'export OS_PROJECT_NAME=\'myproject\'',

4
spec/unit/puppet/provider/cib.xml
View File

@ -136,7 +136,7 @@
</clone>
<primitive class="ocf" id="p_neutron-dhcp-agent" provider="pacemaker" type="neutron-agent-dhcp">
<instance_attributes id="p_neutron-dhcp-agent-instance_attributes">
<nvpair id="p_neutron-dhcp-agent-instance_attributes-os_auth_url" name="os_auth_url" value="http://10.108.2.2:35357/v2.0"/>
<nvpair id="p_neutron-dhcp-agent-instance_attributes-os_auth_url" name="os_auth_url" value="http://10.108.2.2:5000/v2.0"/>
<nvpair id="p_neutron-dhcp-agent-instance_attributes-amqp_server_port" name="amqp_server_port" value="5673"/>
<nvpair id="p_neutron-dhcp-agent-instance_attributes-multiple_agents" name="multiple_agents" value="false"/>
<nvpair id="p_neutron-dhcp-agent-instance_attributes-password" name="password" value="7BqMhboS"/>
@ -180,7 +180,7 @@
</meta_attributes>
<primitive class="ocf" id="p_neutron-l3-agent" provider="pacemaker" type="neutron-agent-l3">
<instance_attributes id="p_neutron-l3-agent-instance_attributes">
<nvpair id="p_neutron-l3-agent-instance_attributes-os_auth_url" name="os_auth_url" value="http://10.108.2.2:35357/v2.0"/>
<nvpair id="p_neutron-l3-agent-instance_attributes-os_auth_url" name="os_auth_url" value="http://10.108.2.2:5000/v2.0"/>
<nvpair id="p_neutron-l3-agent-instance_attributes-multiple_agents" name="multiple_agents" value="true"/>
<nvpair id="p_neutron-l3-agent-instance_attributes-syslog" name="syslog" value="true"/>
<nvpair id="p_neutron-l3-agent-instance_attributes-password" name="password" value="7BqMhboS"/>