openstack
/
puppet-neutron
Code Issues Proposed changes

Ensure tunnel types are absent if not configured 

This patch fixes a bug where updating a configuration wouldn't remove
agent/tunnel_types configuration when required.

Conflicts:
  spec/classes/neutron_agents_ml2_ovs_spec.rb

Change-Id: I8248ad80e6ff88aec252919fa687018bda78a60b
Closes-Bug: #1832251
(cherry picked from commit 6c34ce2a42)
This commit is contained in:
Brent Eagles 2019-06-10 15:54:23 -02:30
parent 66fff82237
commit fedd77e759
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,6 +324,7 @@ class neutron::agents::ml2::ovs (
'ovs/local_ip': ensure => absent;
'ovs/int_peer_patch_port': ensure => absent;
'ovs/tun_peer_patch_port': ensure => absent;
'agent/tunnel_types': ensure => absent;
}
}

1
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@ -60,6 +60,7 @@ describe 'neutron::agents::ml2::ovs' do
is_expected.to contain_neutron_agent_ovs('ovs/local_ip').with_ensure('absent')
is_expected.to contain_neutron_agent_ovs('ovs/int_peer_patch_port').with_ensure('absent')
is_expected.to contain_neutron_agent_ovs('ovs/tun_peer_patch_port').with_ensure('absent')
is_expected.to contain_neutron_agent_ovs('agent/tunnel_types').with_ensure('absent')
end
it 'installs neutron ovs agent package' do