Browse Source

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)
changes/07/666407/1
Brent Eagles 3 months ago
parent
commit
fedd77e759
2 changed files with 2 additions and 0 deletions
  1. 1
    0
      manifests/agents/ml2/ovs.pp
  2. 1
    0
      spec/classes/neutron_agents_ml2_ovs_spec.rb

+ 1
- 0
manifests/agents/ml2/ovs.pp View File

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

+ 1
- 0
spec/classes/neutron_agents_ml2_ovs_spec.rb View File

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

Loading…
Cancel
Save