openstack/puppet-neutron
Code Issues Proposed changes

Fix puppet-neutron's gate

Browse Source 
1) Include openstacklib defaults manifest.
This provides a mechanism for setting default across all modules.

2) Update unit tests for cisco n1kv vem backend.

3) Configure OVS agent to run old interface, and not Ryu (SElinux
alert).

4) Disable sriov backend, we already deploy classic ML2 OVS agent.

5) Specify of_interface and ovsdb_interface in acceptance.

Change-Id: I63e47ab1ae1d44fd570e4f14c722111fc14328ce
Related-Bug: 1599113
This commit is contained in:
Sofer Athlan-Guyot 2016-07-07 12:01:03 +02:00 committed by Denis Egorenko
parent d591774c54
commit 1cd6444358
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/params.pp
View File

@ -1,5 +1,6 @@
# #
class neutron::params { class neutron::params {
include ::openstacklib::defaults
if($::osfamily == 'Redhat') { if($::osfamily == 'Redhat') {
$nobody_user_group = 'nobody' $nobody_user_group = 'nobody'

17
spec/acceptance/basic_neutron_spec.rb
View File

@ -51,7 +51,7 @@ describe 'basic neutron' do
class { '::neutron::plugins::ml2': class { '::neutron::plugins::ml2':
type_drivers => ['vxlan'], type_drivers => ['vxlan'],
tenant_network_types => ['vxlan'], tenant_network_types => ['vxlan'],
mechanism_drivers => ['openvswitch', 'sriovnicswitch'] mechanism_drivers => ['openvswitch'],
} }
class { '::neutron::server': class { '::neutron::server':
database_connection => 'mysql+pymysql://neutron:a_big_secret@127.0.0.1/neutron?charset=utf8', database_connection => 'mysql+pymysql://neutron:a_big_secret@127.0.0.1/neutron?charset=utf8',
@ -75,9 +75,22 @@ describe 'basic neutron' do
local_ip => '127.0.0.1', local_ip => '127.0.0.1',
tunnel_types => ['vxlan'], tunnel_types => ['vxlan'],
} }
class { '::neutron::agents::ml2::sriov': }
class { '::neutron::services::lbaas::haproxy': } class { '::neutron::services::lbaas::haproxy': }
class { '::neutron::services::lbaas::octavia': } class { '::neutron::services::lbaas::octavia': }
# Prior to Newton, the neutron-openvswitch-agent used 'ovs-ofctl' of_interface driver by default.
# In Newton, 'of_interface' defaults to 'native'.
# This mostly eliminates spawning ovs-ofctl and improves performance a little.
# Current openstack-selinux does not allow the Ryu controller to listen on 6633 port.
# So in the meantime, let's use old interface:
# TODO (degorenko): move both parameters to ::neutron::agents::ml2::ovs class
# https://review.openstack.org/#/c/344155/
neutron_agent_ovs {
'ovs/of_interface': value => 'ovs-ofctl';
}
Neutron_agent_ovs<| title == 'ovs/ovsdb_interface'|>{
value => 'vsctl',
}
EOS EOS

6
spec/classes/neutron_agents_n1kv_vem_spec.rb
View File

@ -3,9 +3,11 @@ require 'spec_helper'
describe 'neutron::agents::n1kv_vem' do describe 'neutron::agents::n1kv_vem' do
let :facts do let :facts do
{ :operatingsystem => 'RedHat', OSDefaults.get_facts({
:operatingsystem => 'RedHat',
:operatingsystemrelease => '7', :operatingsystemrelease => '7',
:osfamily => 'RedHat' } :osfamily => 'RedHat',
})
end end
it 'should have a n1kv-vem config file' do it 'should have a n1kv-vem config file' do