From 6c34ce2a42ae8c445a1fbe14ab18d4ee59e09c9b Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Mon, 10 Jun 2019 15:54:23 -0230 Subject: [PATCH] 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. Change-Id: I8248ad80e6ff88aec252919fa687018bda78a60b Closes-Bug: #1832251 --- manifests/agents/ml2/ovs.pp | 1 + spec/classes/neutron_agents_ml2_ovs_spec.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index e14b6cd9a..d8a989955 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -313,6 +313,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; } } diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb index a27a3b45b..d17eaad3f 100644 --- a/spec/classes/neutron_agents_ml2_ovs_spec.rb +++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb @@ -59,6 +59,7 @@ describe 'neutron::agents::ml2::ovs' do should contain_neutron_agent_ovs('ovs/local_ip').with_ensure('absent') should contain_neutron_agent_ovs('ovs/int_peer_patch_port').with_ensure('absent') should contain_neutron_agent_ovs('ovs/tun_peer_patch_port').with_ensure('absent') + should contain_neutron_agent_ovs('agent/tunnel_types').with_ensure('absent') end it 'installs neutron ovs agent package' do