diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/l3.pp b/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/l3.pp
index 4f0dba5c88..cc5a29c1d7 100644
--- a/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/l3.pp
+++ b/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/l3.pp
@@ -33,7 +33,6 @@ class openstack_tasks::openstack_network::agents::l3 {
     class { '::neutron::agents::l3':
       debug                   => $debug,
       metadata_port           => $metadata_port,
-      external_network_bridge => ' ',
       manage_service          => true,
       enabled                 => true,
       agent_mode              => $agent_mode,
diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_network/common_config.pp b/deployment/puppet/openstack_tasks/manifests/openstack_network/common_config.pp
index df88aba508..c010810116 100644
--- a/deployment/puppet/openstack_tasks/manifests/openstack_network/common_config.pp
+++ b/deployment/puppet/openstack_tasks/manifests/openstack_network/common_config.pp
@@ -85,7 +85,6 @@ class openstack_tasks::openstack_network::common_config {
     core_plugin                        => $core_plugin,
     service_plugins                    => $service_plugins,
     allow_overlapping_ips              => true,
-    mac_generation_retries             => '32',
     dhcp_lease_duration                => $dhcp_lease_duration,
     dhcp_agents_per_network            => '2',
     report_interval                    => $neutron_config['neutron_report_interval'],
diff --git a/tests/noop/spec/hosts/openstack-network/agents/l3_spec.rb b/tests/noop/spec/hosts/openstack-network/agents/l3_spec.rb
index d05473806e..914ad3b917 100644
--- a/tests/noop/spec/hosts/openstack-network/agents/l3_spec.rb
+++ b/tests/noop/spec/hosts/openstack-network/agents/l3_spec.rb
@@ -55,9 +55,6 @@ describe manifest do
           it { should contain_class('neutron::agents::l3').with(
             'debug' => Noop.hiera('debug', true)
           )}
-          it { should contain_class('neutron::agents::l3').with(
-            'external_network_bridge' => ' ' # should be present and empty
-          )}
           it { should_not contain_cluster__neutron__l3('default-l3') }
 
           include_examples 'override_resources'
@@ -90,9 +87,6 @@ describe manifest do
         it { should contain_class('neutron::agents::l3').with(
           'debug' => Noop.hiera('debug', true)
         )}
-        it { should contain_class('neutron::agents::l3').with(
-          'external_network_bridge' => ' ' # should be present and empty
-        )}
 
         if ha_agent
           it { should contain_cluster__neutron__l3('default-l3').with(
diff --git a/tests/noop/spec/hosts/openstack-network/common-config_spec.rb b/tests/noop/spec/hosts/openstack-network/common-config_spec.rb
index 65c4f643cf..8c8b06bc21 100644
--- a/tests/noop/spec/hosts/openstack-network/common-config_spec.rb
+++ b/tests/noop/spec/hosts/openstack-network/common-config_spec.rb
@@ -39,7 +39,6 @@ describe manifest do
       it { should contain_class('neutron').with('report_interval' => neutron_config['neutron_report_interval'])}
       it { should contain_class('neutron').with('dhcp_agents_per_network' => '2')}
       it { should contain_class('neutron').with('dhcp_lease_duration' => neutron_config['L3'].fetch('dhcp_lease_duration', '600'))}
-      it { should contain_class('neutron').with('mac_generation_retries' => '32')}
       it { should contain_class('neutron').with('allow_overlapping_ips' => 'true')}
       it { should contain_class('neutron').with('base_mac' => neutron_config['L2']['base_mac'])}
       it { should contain_class('neutron').with('core_plugin' => 'neutron.plugins.ml2.plugin.Ml2Plugin')}