Merge "Add DhcpAgentNotification param to neutron base" into stable/pike

diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index b698004..af3f863 100644 (file)
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -30,6 +30,10 @@ parameters:
     type: number
     default: 0
     description: The number of neutron dhcp agents to schedule per network
+  DhcpAgentNotification:
+    default: true
+    description: Whether or not to enable DHCP agent notifications.
+    type: string
   NeutronDnsDomain:
     type: string
     default: openstacklocal
@@ -133,6 +137,7 @@ outputs:
               - {get_param: NeutronDebug }
             neutron::purge_config: {get_param: EnableConfigPurge}
             neutron::allow_overlapping_ips: true
+            neutron::dhcp_agent_notification: {get_param: DhcpAgentNotification}
             neutron::dns_domain: {get_param: NeutronDnsDomain}
             neutron::rabbit_heartbeat_timeout_threshold: 60
             neutron::host: '%{::fqdn}'