diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp
index 81806f43b..14d47f4d3 100644
--- a/manifests/agents/l3.pp
+++ b/manifests/agents/l3.pp
@@ -174,6 +174,12 @@ class neutron::agents::l3 (
       'DEFAULT/ha_vrrp_auth_password': value => $ha_vrrp_auth_password, secret => true;
       'DEFAULT/ha_vrrp_advert_int':    value => $ha_vrrp_advert_int;
     }
+  } else {
+    neutron_l3_agent_config {
+      'DEFAULT/ha_vrrp_auth_type':     ensure => absent;
+      'DEFAULT/ha_vrrp_auth_password': ensure => absent;
+      'DEFAULT/ha_vrrp_advert_int':    ensure => absent;
+    }
   }
 
   neutron_l3_agent_config {
diff --git a/spec/classes/neutron_agents_l3_spec.rb b/spec/classes/neutron_agents_l3_spec.rb
index 32283b9bf..1d15da48e 100644
--- a/spec/classes/neutron_agents_l3_spec.rb
+++ b/spec/classes/neutron_agents_l3_spec.rb
@@ -30,6 +30,9 @@ describe 'neutron::agents::l3' do
     it { should contain_class('neutron::params') }
 
     it 'configures l3_agent.ini' do
+      should contain_neutron_l3_agent_config('DEFAULT/ha_vrrp_auth_type').with_ensure('absent')
+      should contain_neutron_l3_agent_config('DEFAULT/ha_vrrp_auth_password').with_ensure('absent')
+      should contain_neutron_l3_agent_config('DEFAULT/ha_vrrp_advert_int').with_ensure('absent')
       should contain_neutron_l3_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>')
       should contain_neutron_l3_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver])
       should contain_neutron_l3_agent_config('DEFAULT/handle_internal_only_routers').with_value('<SERVICE DEFAULT>')