openstack/puppet-neutron
Code Issues Proposed changes

Change keystone v2.0 to v3

Browse Source 
Change-Id: Ic9b621bd9d1b4ec6c53b5585ab371ec82417f5ae
This commit is contained in:
Tobias Urdin 2019-02-24 13:42:41 +01:00
parent 5fdbb26cbf
commit 4341812633
10 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/plugins/cisco.pp
View File

@ -30,7 +30,7 @@
#
# [*keystone_auth_url*]
# The url against which to authenticate
# Defaults to http://127.0.0.1:5000/v2.0/
# Defaults to http://127.0.0.1:5000/v3/
#
# [*keystone_tenant*]
# The tenant the supplied user has admin privs in
@ -103,7 +103,7 @@ class neutron::plugins::cisco(
# Keystone connection
$keystone_username = 'neutron',
$keystone_tenant = 'services',
$keystone_auth_url = 'http://127.0.0.1:5000/v2.0/',
$keystone_auth_url = 'http://127.0.0.1:5000/v3/',
$vswitch_plugin = 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2',
$nexus_plugin = $::os_service_default,

4
manifests/plugins/plumgrid.pp
View File

@ -24,7 +24,7 @@
#
# [*connection*]
# Database connection
# Defaults to http://127.0.0.1:5000/v2.0
# Defaults to http://127.0.0.1:5000/v3
#
# [*admin_password*]
# Keystone admin password
@ -101,7 +101,7 @@ class neutron::plugins::plumgrid (
$username = $::os_service_default,
$password = $::os_service_default,
$servertimeout = '99',
$connection = 'http://127.0.0.1:5000/v2.0',
$connection = 'http://127.0.0.1:5000/v3',
$admin_password = $::os_service_default,
$controller_priv_host = '127.0.0.1',
$auth_protocol = 'http',

8
releasenotes/notes/change-keystone-v3-971aae0570c1f364.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The default value for neutron::plugins::cisco::keystone_auth_url
is changed from http://127.0.0.1:5000/v2.0/ to http://127.0.0.1:5000/v3/
- |
The default value for neutron::plugins::plumgrid::connection is
changed from http://127.0.0.1:5000/v2.0 to http://127.0.0.1:5000/v3

2
spec/classes/neutron_plugins_cisco_spec.rb
View File

@ -13,7 +13,7 @@ describe 'neutron::plugins::cisco' do
{
:keystone_username => 'neutron',
:keystone_password => 'neutron_pass',
:keystone_auth_url => 'http://127.0.0.1:5000/v2.0/',
:keystone_auth_url => 'http://127.0.0.1:5000/v3/',
:keystone_tenant => 'tenant',
:database_name => 'neutron',
:database_pass => 'dbpass',

2
spec/classes/neutron_plugins_opencontrail_spec.rb
View File

@ -15,7 +15,7 @@ describe 'neutron::plugins::opencontrail' do
:api_server_port => '8082',
:multi_tenancy => 'true',
:contrail_extensions => ['ipam:ipam','policy:policy','route-table'],
:keystone_auth_url => 'http://keystone-server:5000/v2.0',
:keystone_auth_url => 'http://keystone-server:5000/v3',
:keystone_admin_user => 'admin',
:keystone_admin_tenant_name => 'admin',
:keystone_admin_password => 'admin',

2
spec/classes/neutron_plugins_plumgrid_spec.rb
View File

@ -14,7 +14,7 @@ describe 'neutron::plugins::plumgrid' do
:director_server => '127.0.0.1',
:director_server_port => '443',
:servertimeout => '99',
:connection => 'http://127.0.0.1:5000/v2.0',
:connection => 'http://127.0.0.1:5000/v3',
:controller_priv_host => '127.0.0.1',
:auth_protocol => 'http',
:identity_version => 'v3',

8
spec/classes/neutron_server_notifications_spec.rb
View File

@ -58,8 +58,8 @@ describe 'neutron::server::notifications' do
:notify_nova_on_port_status_changes => false,
:notify_nova_on_port_data_changes => false,
:send_events_interval => '10',
:auth_url => 'http://keystone:5000/v2.0',
:auth_type => 'v2password',
:auth_url => 'http://keystone:5000/v3',
:auth_type => 'password',
:username => 'joe',
:region_name => 'MyRegion',
:tenant_id => 'UUID2',
@ -75,8 +75,8 @@ describe 'neutron::server::notifications' do
should contain_neutron_config('DEFAULT/notify_nova_on_port_status_changes').with_value(false)
should contain_neutron_config('DEFAULT/notify_nova_on_port_data_changes').with_value(false)
should contain_neutron_config('DEFAULT/send_events_interval').with_value('10')
should contain_neutron_config('nova/auth_url').with_value('http://keystone:5000/v2.0')
should contain_neutron_config('nova/auth_type').with_value('v2password')
should contain_neutron_config('nova/auth_url').with_value('http://keystone:5000/v3')
should contain_neutron_config('nova/auth_type').with_value('password')
should contain_neutron_config('nova/username').with_value('joe')
should contain_neutron_config('nova/password').with_value('secrete')
should contain_neutron_config('nova/password').with_secret( true )

8
spec/classes/neutron_server_placement_spec.rb
View File

@ -48,8 +48,8 @@ describe 'neutron::server::placement' do
context 'when overriding parameters' do
before :each do
params.merge!(
:auth_url => 'http://keystone:5000/v2.0',
:auth_type => 'v2password',
:auth_url => 'http://keystone:5000/v3',
:auth_type => 'password',
:username => 'joe',
:region_name => 'MyRegion',
:project_domain_id => 'default_1',
@ -61,8 +61,8 @@ describe 'neutron::server::placement' do
end
it 'should configure neutron server with overrided parameters' do
should contain_neutron_config('placement/auth_url').with_value('http://keystone:5000/v2.0')
should contain_neutron_config('placement/auth_type').with_value('v2password')
should contain_neutron_config('placement/auth_url').with_value('http://keystone:5000/v3')
should contain_neutron_config('placement/auth_type').with_value('password')
should contain_neutron_config('placement/username').with_value('joe')
should contain_neutron_config('placement/password').with_value('secrete')
should contain_neutron_config('placement/password').with_secret( true )

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_PASSWORD'] = 'password'
ENV['OS_PROJECT_NAME'] = 'admin_tenant'
ENV['OS_AUTH_URL'] = 'https://192.168.56.210:5000/v2.0/'
ENV['OS_AUTH_URL'] = 'https://192.168.56.210:5000/v3/'
end
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',
'username' => 'admin',
'password' => 'password',
'auth_url' => 'https://192.168.56.210:5000/v2.0/',
'auth_url' => 'https://192.168.56.210:5000/v3/',
'project_domain_name' => 'Default',
'user_domain_name' => 'Default',
}