Merge "Use in model repo key"
diff --git a/README.rst b/README.rst
index ba0d7b4..d7350c8 100644
--- a/README.rst
+++ b/README.rst
@@ -583,6 +583,7 @@
version: 2.2
enabled: True
hostname: node-12.domain.tld
+ flow_hold_limit: 0
discovery:
host: 127.0.0.1
interface:
diff --git a/opencontrail/compute.sls b/opencontrail/compute.sls
index 8462c7f..117ca83 100644
--- a/opencontrail/compute.sls
+++ b/opencontrail/compute.sls
@@ -169,10 +169,20 @@
/etc/modprobe.d/vrouter.conf:
file.managed:
- - contents: "options vrouter vr_flow_entries=2097152"
+ - source: salt://opencontrail/files/vrouter.conf
+ - template: jinja
{%- if network.interface.get('vhost0', {}).get('enabled', False) %}
{%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %}
+{%- if compute.flow_hold_limit is defined %}
+
+contrail_vrouter_flow_hold_limit:
+ cmd.run:
+ - name: "vrouter --flow_hold_limit {{ compute.flow_hold_limit }}"
+ - onchanges:
+ - file: /etc/modprobe.d/vrouter.conf
+
+{%- endif %}
contrail_load_vrouter_kernel_module:
cmd.run:
diff --git a/opencontrail/files/vrouter.conf b/opencontrail/files/vrouter.conf
new file mode 100644
index 0000000..f20b4eb
--- /dev/null
+++ b/opencontrail/files/vrouter.conf
@@ -0,0 +1,7 @@
+{%- from "opencontrail/map.jinja" import compute with context %}
+{%- if compute.flow_hold_limit is defined %}
+options vrouter vr_flow_entries=2097152 vr_flow_hold_limit={{ compute.flow_hold_limit }}
+{%- else %}
+options vrouter vr_flow_entries=2097152
+{%- endif %}
+