Merge "allow configuration of max_vm_flows through salt-formula"
diff --git a/opencontrail/files/2.2/contrail-vrouter-agent.conf b/opencontrail/files/2.2/contrail-vrouter-agent.conf
index 0aa2672..1c306d5 100644
--- a/opencontrail/files/2.2/contrail-vrouter-agent.conf
+++ b/opencontrail/files/2.2/contrail-vrouter-agent.conf
@@ -115,6 +115,9 @@
# Maximum flows allowed per VM (given as % of maximum system flows)
# max_vm_flows=100
+{%- if compute.max_vm_flows is defined %}
+max_vm_flows={{ compute.max_vm_flows }}
+{%- endif %}
# Maximum number of link-local flows allowed across all VMs
# max_system_linklocal_flows=4096
# Maximum number of link-local flows allowed per VM
diff --git a/opencontrail/files/3.0/contrail-vrouter-agent.conf b/opencontrail/files/3.0/contrail-vrouter-agent.conf
index bea2565..9170aee 100644
--- a/opencontrail/files/3.0/contrail-vrouter-agent.conf
+++ b/opencontrail/files/3.0/contrail-vrouter-agent.conf
@@ -161,6 +161,9 @@
# Maximum flows allowed per VM (given as % of maximum system flows)
# max_vm_flows=100
+{%- if compute.max_vm_flows is defined %}
+max_vm_flows={{ compute.max_vm_flows }}
+{%- endif %}
# Maximum number of link-local flows allowed across all VMs
# max_system_linklocal_flows=4096
# Maximum number of link-local flows allowed per VM
diff --git a/opencontrail/files/4.0/contrail-vrouter-agent.conf b/opencontrail/files/4.0/contrail-vrouter-agent.conf
index 3d244cc..7110ce9 100644
--- a/opencontrail/files/4.0/contrail-vrouter-agent.conf
+++ b/opencontrail/files/4.0/contrail-vrouter-agent.conf
@@ -168,6 +168,9 @@
#
# Maximum flows allowed per VM (given as % of maximum system flows)
# max_vm_flows=
+{%- if compute.max_vm_flows is defined %}
+max_vm_flows={{ compute.max_vm_flows }}
+{%- endif %}
# Maximum number of link-local flows allowed across all VMs
# max_system_linklocal_flows=4096