openstack/puppet-neutron
Code Issues Proposed changes

Merge "Fixes OVS agent pkg and service name"

Browse Source
This commit is contained in:
Jenkins 2016-01-07 19:48:34 +00:00 committed by Gerrit Code Review
commit 7b241eeca6
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/params.pp
View File

@ -95,8 +95,16 @@ class neutron::params {
$ml2_server_package = false
}
$ovs_agent_package = 'neutron-plugin-openvswitch-agent'
$ovs_agent_service = 'neutron-plugin-openvswitch-agent'
case $::os_package_type {
'debian': {
$ovs_agent_package = 'neutron-openvswitch-agent'
$ovs_agent_service = 'neutron-openvswitch-agent'
}
default: {
$ovs_agent_package = 'neutron-plugin-openvswitch-agent'
$ovs_agent_service = 'neutron-plugin-openvswitch-agent'
}
}
$ovs_server_package = 'neutron-plugin-openvswitch'
$ovs_cleanup_service = false
$ovs_package = 'openvswitch-switch'

19
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@ -244,7 +244,24 @@ describe 'neutron::agents::ml2::ovs' do
context 'on Debian platforms' do
let :facts do
@default_facts.merge(test_facts.merge({
:osfamily => 'Debian'
:osfamily => 'Debian',
:os_package_type => 'debian'
}))
end
let :platform_params do
{ :ovs_agent_package => 'neutron-openvswitch-agent',
:ovs_agent_service => 'neutron-openvswitch-agent' }
end
it_configures 'neutron plugin ovs agent with ml2 plugin'
end
context 'on Ubuntu platforms' do
let :facts do
@default_facts.merge(test_facts.merge({
:osfamily => 'Debian',
:os_package_type => 'ubuntu'
}))
end