openstack/puppet-neutron
Code Issues Proposed changes

Do not create tun and int bridges manually

Browse Source 
Currently integration and tunnel bridges are created by Puppet
during deployment. It looks like it's not needed anymore because
Neutron handles them itself

Change-Id: Id41071fc6128965f4d4cf6b1e03b75e91f8fbec0
Closes-bug: #1436422
This commit is contained in:
Sergey Kolekonov
2015-03-30 14:05:54 +03:00
committed by Emilien Macchi
parent 18cb802445
commit c14a00b322
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/agents/ml2/ovs.pp
View File

@@ -166,16 +166,7 @@ class neutron::agents::ml2::ovs (
neutron_agent_ovs { 'securitygroup/firewall_driver': ensure => absent }
}
vs_bridge { $integration_bridge:
ensure => present,
before => Service['neutron-ovs-agent-service'],
}
if $enable_tunneling {
vs_bridge { $tunnel_bridge:
ensure => present,
before => Service['neutron-ovs-agent-service'],
}
neutron_agent_ovs {
'ovs/enable_tunneling': value => true;
'ovs/tunnel_bridge': value => $tunnel_bridge;

12
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@@ -51,14 +51,6 @@ describe 'neutron::agents::ml2::ovs' do
is_expected.to contain_neutron_agent_ovs('ovs/local_ip').with_ensure('absent')
end
it 'configures vs_bridge' do
is_expected.to contain_vs_bridge(p[:integration_bridge]).with(
:ensure => 'present',
:before => 'Service[neutron-ovs-agent-service]'
)
is_expected.not_to contain_vs_brige(p[:integration_bridge])
end
it 'installs neutron ovs agent package' do
if platform_params.has_key?(:ovs_agent_package)
is_expected.to contain_package('neutron-ovs-agent').with(
@@ -155,10 +147,6 @@ describe 'neutron::agents::ml2::ovs' do
is_expected.to contain_neutron_agent_ovs('ovs/enable_tunneling').with_value(true)
is_expected.to contain_neutron_agent_ovs('ovs/tunnel_bridge').with_value(default_params[:tunnel_bridge])
is_expected.to contain_neutron_agent_ovs('ovs/local_ip').with_value('127.0.0.1')
is_expected.to contain_vs_bridge(default_params[:tunnel_bridge]).with(
:ensure => 'present',
:before => 'Service[neutron-ovs-agent-service]'
)
end
end