Merge "Handle agent_boot_time option"
diff --git a/README.rst b/README.rst
index 187a911..e9f63d0 100644
--- a/README.rst
+++ b/README.rst
@@ -29,6 +29,7 @@
root_helper_daemon: false
dhcp_lease_duration: 600
firewall_driver: iptables_hybrid
+ agent_boot_time: 180
bind:
address: 172.20.0.1
port: 9696
diff --git a/neutron/files/ocata/ml2_conf.ini b/neutron/files/ocata/ml2_conf.ini
index c0fbbd3..561f518 100644
--- a/neutron/files/ocata/ml2_conf.ini
+++ b/neutron/files/ocata/ml2_conf.ini
@@ -111,6 +111,18 @@
#fatal_deprecations = false
+[l2pop]
+
+#
+# From neutron.ml2
+#
+
+# Delay within which agent is expected to update existing ports when it
+# restarts (integer value)
+#agent_boot_time = 180
+agent_boot_time = {{ server.get('agent_boot_time', 180) }}
+
+
[ml2]
#
diff --git a/neutron/files/pike/ml2_conf.ini b/neutron/files/pike/ml2_conf.ini
index d46a271..a953f0a 100644
--- a/neutron/files/pike/ml2_conf.ini
+++ b/neutron/files/pike/ml2_conf.ini
@@ -111,6 +111,18 @@
#fatal_deprecations = false
+[l2pop]
+
+#
+# From neutron.ml2
+#
+
+# Delay within which agent is expected to update existing ports when it
+# restarts (integer value)
+#agent_boot_time = 180
+agent_boot_time = {{ server.get('agent_boot_time', 180) }}
+
+
[ml2]
#
diff --git a/neutron/files/queens/ml2_conf.ini b/neutron/files/queens/ml2_conf.ini
index 53b118b..6f0ee0d 100644
--- a/neutron/files/queens/ml2_conf.ini
+++ b/neutron/files/queens/ml2_conf.ini
@@ -6,6 +6,7 @@
{%- include "oslo_templates/files/queens/oslo/_log.conf" %}
{%- endif %}
+
[l2pop]
#
@@ -15,6 +16,7 @@
# Delay within which agent is expected to update existing ports when it
# restarts (integer value)
#agent_boot_time = 180
+agent_boot_time = {{ server.get('agent_boot_time', 180) }}
[ml2]
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 2d70ca2..964f3bd 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -9,6 +9,7 @@
api_workers: 2
rpc_workers: 2
dhcp_lease_duration: 86400
+ agent_boot_time: 900
backend:
engine: contrail
#contrail_discovery_host