diff --git a/manifests/init.pp b/manifests/init.pp
index 92e49b68c..1ed386148 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -329,6 +329,10 @@
 #      transport://user:pass@host1:port[,hostN:portN]/virtual_host
 #   Defaults to $::os_service_default.
 #
+# [*max_allowed_address_pair*]
+#   (optional) Maximum number of allowed address pairs per port
+#   Defaults to $::os_service_default.
+#
 # DEPRECATED PARAMETERS
 #
 # [*rabbit_password*]
@@ -422,6 +426,7 @@ class neutron (
   $notification_driver                  = $::os_service_default,
   $notification_topics                  = $::os_service_default,
   $notification_transport_url           = $::os_service_default,
+  $max_allowed_address_pair             = $::os_service_default,
   # DEPRECATED PARAMETERS
   $rabbit_password                      = $::os_service_default,
   $rabbit_host                          = $::os_service_default,
@@ -501,6 +506,7 @@ instead.")
     'DEFAULT/api_extensions_path':     value => $api_extensions_path;
     'DEFAULT/state_path':              value => $state_path;
     'DEFAULT/global_physnet_mtu':      value => $global_physnet_mtu;
+    'DEFAULT/max_allowed_address_pair':value => $max_allowed_address_pair;
     'agent/root_helper':               value => $root_helper;
     'agent/root_helper_daemon':        value => $root_helper_daemon;
     'agent/report_interval':           value => $report_interval;
diff --git a/releasenotes/notes/add-max_allowed_address_pair-e1c3c4ace13af591.yaml b/releasenotes/notes/add-max_allowed_address_pair-e1c3c4ace13af591.yaml
new file mode 100644
index 000000000..43ea31f1b
--- /dev/null
+++ b/releasenotes/notes/add-max_allowed_address_pair-e1c3c4ace13af591.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - Add the Neutron configuration parameter "max_allowed_address_pair"
+    to Puppet so that more than the default 10 address pairs per port
+    can be used.
diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
index 385431333..deb042691 100644
--- a/spec/classes/neutron_init_spec.rb
+++ b/spec/classes/neutron_init_spec.rb
@@ -91,6 +91,7 @@ describe 'neutron' do
     it_configures 'with dns_domain defined'
     it_configures 'with transport_url defined'
     it_configures 'with rootwrap daemon'
+    it_configures 'with max_allowed_address_pair defined'
 
     context 'with amqp messaging' do
       it_configures 'amqp support'
@@ -520,6 +521,18 @@ describe 'neutron' do
     end
   end
 
+  shared_examples_for 'with max_allowed_address_pair defined' do
+    before do
+      params.merge!(
+        :max_allowed_address_pair => '50'
+      )
+    end
+
+    it do
+      is_expected.to contain_neutron_config('DEFAULT/max_allowed_address_pair').with_value(params[:max_allowed_address_pair])
+    end
+  end
+
   context 'on Debian platforms' do
     let :facts do
       @default_facts.merge(test_facts.merge({