Skip to content

Commit

Permalink
Install neutron-plugin-ml2 package on Ubuntu
Browse files Browse the repository at this point in the history
While there is no dedicated package for neutron-plugin-ml2 on Debian,
there is one on Ubuntu operating systems.

We should install it when ML2 core plugin is enabled.

Closes-bug: #1337988
Change-Id: I8ee2bca21cc3f32c017529b55c92a50094aa25d5
  • Loading branch information
mgagne committed Jul 7, 2014
1 parent 837e27c commit c4e4818
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
6 changes: 5 additions & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@
$server_service = 'neutron-server'
$client_package = 'python-neutronclient'

$ml2_server_package = false
if $::operatingsystem == 'Ubuntu' {
$ml2_server_package = 'neutron-plugin-ml2'
} else {
$ml2_server_package = false
}

$ovs_agent_package = 'neutron-plugin-openvswitch-agent'
$ovs_agent_service = 'neutron-plugin-openvswitch-agent'
Expand Down
17 changes: 16 additions & 1 deletion spec/classes/neutron_plugins_ml2_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,22 @@
{}
end

it_configures 'neutron plugin ml2'
context 'on Ubuntu operating systems' do
before do
facts.merge!({:operatingsystem => 'Ubuntu'})
platform_params.merge!(:ml2_server_package => 'neutron-plugin-ml2')
end

it_configures 'neutron plugin ml2'
end

context 'on non-Ubuntu operating systems' do
before do
facts.merge!({:operatingsystem => 'Debian'})
end

it_configures 'neutron plugin ml2'
end
end

context 'on RedHat platforms' do
Expand Down

0 comments on commit c4e4818

Please sign in to comment.