diff --git a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 index cf7827f9..4a788280 100644 --- a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 +++ b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 @@ -43,19 +43,19 @@ 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' %} +{% raw %}{% if session_distribution_policy.hash_key == 'outer-most-sip-dip' %} distmode=0 {% endif %} -{% if load_balancing_distribution.mode == 'outer_tuple4' %} +{% if session_distribution_policy.hash_key == 'outer-most-sip-dip-sport-dport' %} distmode=1 {% endif %} -{% if load_balancing_distribution.mode == 'inner_tuple2' %} +{% if session_distribution_policy.hash_key == 'inner-most-sip-dip' %} distmode=2 {% endif %} -{% if load_balancing_distribution.mode == 'inner_tuple4' %} +{% if session_distribution_policy.hash_key == 'inner-most-sip-dip-sport-dport' %} distmode=3 {% endif %} -{% if load_balancing_distribution.mode == 'hardware' %} +{% if session_distribution_policy.hash_key == 'hardware' %} distmode=4 {% endif %} {% endraw %} diff --git a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01 index eb14a215..67bc0db0 100644 --- a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01 +++ b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01 @@ -35,19 +35,19 @@ 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' %} +{% raw %}{% if session_distribution_policy.hash_key == 'outer-most-sip-dip' %} distmode=0 {% endif %} -{% if load_balancing_distribution.mode == 'outer_tuple4' %} +{% if session_distribution_policy.hash_key == 'outer-most-sip-dip-sport-dport' %} distmode=1 {% endif %} -{% if load_balancing_distribution.mode == 'inner_tuple2' %} +{% if session_distribution_policy.hash_key == 'inner-most-sip-dip' %} distmode=2 {% endif %} -{% if load_balancing_distribution.mode == 'inner_tuple4' %} +{% if session_distribution_policy.hash_key == 'inner-most-sip-dip-sport-dport' %} distmode=3 {% endif %} -{% if load_balancing_distribution.mode == 'hardware' %} +{% if session_distribution_policy.hash_key == 'hardware' %} distmode=4 {% endif %} {% endraw %} 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 e8061e80..9a8a813e 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 @@ -57,6 +57,7 @@ cm: 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 +#####session_distribution_policy.hash_key in [outer-most-sip-dip,outer-most-sip-dip-sport-dport,inner-most-sip-dip,inner-most-sip-dip-sport-dport] +session_distribution_policy: + mode: sym-hash + hash_key: inner-most-sip-dip \ 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 6d5447d3..3f483ee2 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 @@ -56,6 +56,7 @@ cm: 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 +#####session_distribution_policy.hash_key in [outer-most-sip-dip,outer-most-sip-dip-sport-dport,inner-most-sip-dip,inner-most-sip-dip-sport-dport] +session_distribution_policy: + mode: sym-hash + hash_key: inner-most-sip-dip