Merge "Add param to configure neutron agent_down_time and report_interval" into stable/ussuri

deployment/neutron/neutron-api-container-puppet.yaml

@@ -191,6 +191,13 @@ parameters:
       removed in Ocata.  Future releases will enable L3 HA by default if it is
       appropriate for the deployment type. Alternate mechanisms will be
       available to override.
+  NeutronAgentDownTime:
+    default: 600
+    type: number
+    description: |
+      Seconds to regard the agent as down; should be at least twice
+      NeutronGlobalReportInterval, to be sure the agent is down for good.
+
 parameter_groups:
 - label: deprecated
   description: |
@@ -298,6 +305,7 @@ outputs:
             neutron::policy::policies: {get_param: NeutronApiPolicies}
             neutron::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+            neutron::server::agent_down_time: {get_param: NeutronAgentDownTime}
             neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
             neutron::server::enable_proxy_headers_parsing: true
             neutron::server::igmp_snooping_enable: {get_param: NeutronEnableIgmpSnooping}

deployment/neutron/neutron-base.yaml

@@ -111,6 +111,12 @@ parameters:
         If True, then allow plugins that support it to create VLAN
         transparent networks.
     type: boolean
+  NeutronGlobalReportInterval:
+    default: 300
+    description: >
+      Seconds between nodes reporting state to server; should be less than
+      NeutronAgentDownTime, best if it is half or less than NeutronAgentDownTime.
+    type: number
 
 conditions:
   dhcp_agents_zero: {equals : [{get_param: NeutronDhcpAgentsPerNetwork}, 0]}
@@ -127,6 +133,7 @@ outputs:
           - neutron::notification_driver: {get_param: NotificationDriver}
             neutron::core_plugin: {get_param: NeutronCorePlugin}
             neutron::service_plugins: {get_param: NeutronServicePlugins}
+            neutron::report_interval: {get_param: NeutronGlobalReportInterval}
             neutron::logging::debug:
               if:
               - service_debug_unset

releasenotes/notes/agent_down_time-d6aebe530ca31b9e.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Add param NeutronAgentDownTime to configure neutron server agent_down_time
+    Seconds to regard the agent as down; should be at least twice
+    report_interval, to be sure the agent is down for good.
+    agent_down_time is a config for neutron-server, set by class neutron::server
+    report_interval is a config for neutron agents, set by class neutron