Merge "Network RBAC rule management implemented."
diff --git a/README.rst b/README.rst
index ca02600..99a54ad 100644
--- a/README.rst
+++ b/README.rst
@@ -1521,6 +1521,7 @@
gateway:
of_connect_timeout: 60
of_request_timeout: 30
+ of_inactivity_probe: 30
ovs_vsctl_timeout: 30 # Pike
ovsdb_timeout: 30 # Queens and beyond
bridge_mac_table_size: 100000
diff --git a/neutron/files/pike/openvswitch_agent.ini b/neutron/files/pike/openvswitch_agent.ini
index 19ade98..bdf5239 100644
--- a/neutron/files/pike/openvswitch_agent.ini
+++ b/neutron/files/pike/openvswitch_agent.ini
@@ -333,6 +333,15 @@
of_request_timeout = {{ neutron.of_request_timeout }}
{%- endif %}
+# The inactivity_probe interval in seconds for the local
+# switch connection to the controller.
+# A value of 0 disables inactivity probes.
+# Used only for 'native' driver.
+#of_inactivity_probe=10
+{%- if neutron.of_inactivity_probe is defined %}
+of_inactivity_probe = {{ neutron.of_inactivity_probe }}
+{%- endif %}
+
# The interface for interacting with the OVSDB (string value)
# Allowed values: vsctl, native
#ovsdb_interface = native
diff --git a/neutron/files/queens/openvswitch_agent.ini b/neutron/files/queens/openvswitch_agent.ini
index d642dec..d5703b0 100644
--- a/neutron/files/queens/openvswitch_agent.ini
+++ b/neutron/files/queens/openvswitch_agent.ini
@@ -218,6 +218,15 @@
of_request_timeout = {{ neutron.of_request_timeout }}
{%- endif %}
+# The inactivity_probe interval in seconds for the local
+# switch connection to the controller.
+# A value of 0 disables inactivity probes.
+# Used only for 'native' driver.
+#of_inactivity_probe=10
+{%- if neutron.of_inactivity_probe is defined %}
+of_inactivity_probe = {{ neutron.of_inactivity_probe }}
+{%- endif %}
+
# DEPRECATED: The interface for interacting with the OVSDB (string value)
# Possible values:
# native - <No description provided>
diff --git a/neutron/files/rocky/openvswitch_agent.ini b/neutron/files/rocky/openvswitch_agent.ini
index 957af4c..3e088f8 100644
--- a/neutron/files/rocky/openvswitch_agent.ini
+++ b/neutron/files/rocky/openvswitch_agent.ini
@@ -219,6 +219,15 @@
of_request_timeout = {{ neutron.of_request_timeout }}
{%- endif %}
+# The inactivity_probe interval in seconds for the local
+# switch connection to the controller.
+# A value of 0 disables inactivity probes.
+# Used only for 'native' driver.
+#of_inactivity_probe=10
+{%- if neutron.of_inactivity_probe is defined %}
+of_inactivity_probe = {{ neutron.of_inactivity_probe }}
+{%- endif %}
+
# DEPRECATED: The interface for interacting with the OVSDB (string value)
# Possible values:
# native - <No description provided>