From e19fdb323b2f54395cc01e38d685daa2df4d5225 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Tue, 16 Nov 2021 21:07:23 +0800
Subject: [PATCH] =?UTF-8?q?feature:TSG-8535:provision=E6=96=B0=E5=A2=9Eloa?=
 =?UTF-8?q?d=5Fbalancing=5Fdistribution=E9=85=8D=E7=BD=AE=E9=A1=B9?=
 =?UTF-8?q?=E6=9D=A5=E9=85=8D=E7=BD=AEmrzcpd=E5=88=86=E6=B5=81=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/mrglobal.conf.j2.j2.7400MCN0P01R01  | 15 +++++++++++++++
 .../templates/mrglobal.conf.j2.j2.9000NPBP01R01   | 15 +++++++++++++++
 .../provision.default.yml.7400MCN0P01R01          |  4 ++++
 .../provision.default.yml.9000NPBP01R01           |  4 ++++
 4 files changed, 38 insertions(+)

diff --git a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01
index bb65140d..cf7827f9 100644
--- a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01
+++ b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01
@@ -43,7 +43,22 @@ rssmode=0
 [service]
 # lcore id for i/o service, use comma to split
 iocore={{ mrzcpd.mrglobal_conf.service.iocore }}
+{% raw %}{% if load_balancing_distribution.mode == 'outer_tuple2' %}
+distmode=0
+{% endif %}
+{% if load_balancing_distribution.mode == 'outer_tuple4' %}
+distmode=1
+{% endif %}
+{% if load_balancing_distribution.mode == 'inner_tuple2' %}
 distmode=2
+{% endif %}
+{% if load_balancing_distribution.mode == 'inner_tuple4' %}
+distmode=3
+{% endif %}
+{% if load_balancing_distribution.mode == 'hardware' %}
+distmode=4
+{% endif %}
+{% endraw %}
 hashmode=0
 
 [eal]
diff --git a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01
index e68fa47e..eb14a215 100644
--- a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01
+++ b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01
@@ -35,7 +35,22 @@ vlan-strip=1
 [service]
 # lcore id for i/o service, use comma to split
 iocore={{ mrzcpd.mrglobal_conf.service.iocore }}
+{% raw %}{% if load_balancing_distribution.mode == 'outer_tuple2' %}
+distmode=0
+{% endif %}
+{% if load_balancing_distribution.mode == 'outer_tuple4' %}
+distmode=1
+{% endif %}
+{% if load_balancing_distribution.mode == 'inner_tuple2' %}
 distmode=2
+{% endif %}
+{% if load_balancing_distribution.mode == 'inner_tuple4' %}
+distmode=3
+{% endif %}
+{% if load_balancing_distribution.mode == 'hardware' %}
+distmode=4
+{% endif %}
+{% endraw %}
 hashmode=0
 idle_threshold=10000
 
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
index de190a86..e8061e80 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
@@ -56,3 +56,7 @@ cm:
     port_num: 1
     db_static: 0
     db_dynamic: 1
+
+#####load_balancing_distribution.mode in [outer_tuple2,outer_tuple4,inner_tuple2,inner_tuple4,hardware]
+load_balancing_distribution:
+  mode: inner_tuple2
\ No newline at end of file
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
index 73de7527..6d5447d3 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
@@ -55,3 +55,7 @@ cm:
     port_num: 1
     db_static: 0
     db_dynamic: 1
+
+#####load_balancing_distribution.mode in [outer_tuple2,outer_tuple4,inner_tuple2,inner_tuple4,hardware]
+load_balancing_distribution:
+  mode: inner_tuple2