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: Icc0060e5df9dc3d0bc6a29fc8249ed3b37435b9d
This commit is contained in:
melissaml 2018-07-24 19:17:38 +08:00 committed by Tobias Urdin
parent c774cb1ca3
commit 8a1cd803f7
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/plugins/plumgrid.pp
View File

@ -24,7 +24,7 @@
# #
# [*connection*] # [*connection*]
# Database connection # Database connection
# Defaults to http://127.0.0.1:35357/v2.0 # Defaults to http://127.0.0.1:5000/v2.0
# #
# [*admin_password*] # [*admin_password*]
# Keystone admin password # Keystone admin password
@ -101,7 +101,7 @@ class neutron::plugins::plumgrid (
$username = $::os_service_default, $username = $::os_service_default,
$password = $::os_service_default, $password = $::os_service_default,
$servertimeout = '99', $servertimeout = '99',
$connection = 'http://127.0.0.1:35357/v2.0', $connection = 'http://127.0.0.1:5000/v2.0',
$admin_password = $::os_service_default, $admin_password = $::os_service_default,
$controller_priv_host = '127.0.0.1', $controller_priv_host = '127.0.0.1',
$auth_protocol = 'http', $auth_protocol = 'http',
@ -181,7 +181,7 @@ class neutron::plugins::plumgrid (
neutron_plumlib_plumgrid { neutron_plumlib_plumgrid {
'keystone_authtoken/admin_user' : value => 'admin'; 'keystone_authtoken/admin_user' : value => 'admin';
'keystone_authtoken/admin_password': value => $admin_password, secret =>true; 'keystone_authtoken/admin_password': value => $admin_password, secret =>true;
'keystone_authtoken/auth_uri': value => "${auth_protocol}://${controller_priv_host}:35357/${identity_version}"; 'keystone_authtoken/auth_uri': value => "${auth_protocol}://${controller_priv_host}:5000/${identity_version}";
'keystone_authtoken/admin_tenant_name': value => 'admin'; 'keystone_authtoken/admin_tenant_name': value => 'admin';
'keystone_authtoken/identity_version': value => $identity_version; 'keystone_authtoken/identity_version': value => $identity_version;
'keystone_authtoken/user_domain_name': value => $user_domain_name; 'keystone_authtoken/user_domain_name': value => $user_domain_name;

4
spec/classes/neutron_plugins_plumgrid_spec.rb
View File

@ -15,7 +15,7 @@ describe 'neutron::plugins::plumgrid' do
:director_server => '127.0.0.1', :director_server => '127.0.0.1',
:director_server_port => '443', :director_server_port => '443',
:servertimeout => '99', :servertimeout => '99',
:connection => 'http://127.0.0.1:35357/v2.0', :connection => 'http://127.0.0.1:5000/v2.0',
:controller_priv_host => '127.0.0.1', :controller_priv_host => '127.0.0.1',
:auth_protocol => 'http', :auth_protocol => 'http',
:identity_version => 'v3', :identity_version => 'v3',
@ -82,7 +82,7 @@ describe 'neutron::plugins::plumgrid' do
end end
it 'should perform default configuration of plumgrid plumlib' do it 'should perform default configuration of plumgrid plumlib' do
auth_uri = params[:auth_protocol] + "://" + params[:controller_priv_host] + ":" + "35357/" + params[:identity_version]; auth_uri = params[:auth_protocol] + "://" + params[:controller_priv_host] + ":" + "5000/" + params[:identity_version];
is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/auth_uri').with_value(auth_uri) is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/auth_uri').with_value(auth_uri)
is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/identity_version').with_value(params[:identity_version]) is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/identity_version').with_value(params[:identity_version])
is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name]) is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name])

2
spec/unit/provider/neutron_security_group/openstack_spec.rb
View File

@ -10,7 +10,7 @@ describe provider_class do
ENV['OS_USERNAME'] = 'admin' ENV['OS_USERNAME'] = 'admin'
ENV['OS_PASSWORD'] = 'password' ENV['OS_PASSWORD'] = 'password'
ENV['OS_PROJECT_NAME'] = 'admin_tenant' ENV['OS_PROJECT_NAME'] = 'admin_tenant'
ENV['OS_AUTH_URL'] = 'https://192.168.56.210:35357/v2.0/' ENV['OS_AUTH_URL'] = 'https://192.168.56.210:5000/v2.0/'
end end
before(:each) do before(:each) do

2
spec/unit/provider/neutron_spec.rb
View File

@ -14,7 +14,7 @@ describe Puppet::Provider::Neutron do
'project_name' => 'admin_tenant', 'project_name' => 'admin_tenant',
'username' => 'admin', 'username' => 'admin',
'password' => 'password', 'password' => 'password',
'www_authenticate_uri' => 'https://192.168.56.210:35357/v2.0/', 'www_authenticate_uri' => 'https://192.168.56.210:5000/v2.0/',
'project_domain_name' => 'Default', 'project_domain_name' => 'Default',
'user_domain_name' => 'Default', 'user_domain_name' => 'Default',
} }