From d6fad0f2a65e429499448a2baba1f19c7a4f252a Mon Sep 17 00:00:00 2001 From: Manish Date: Mon, 4 May 2015 15:25:28 +0530 Subject: [PATCH] Move VXLAN to the highest priority in encapsulation list. With support of EVPN, VXLAN will be the only supported encap for intra-subnet traffic (i.e. bridge). So push VXLAN at highest priority. Layer3 will continue using MPLS encapsulation only. Change-Id: I4ef0fe906d9b791e168c7032fa38ca1d0e624aa9 Closes-bug: 1446762 --- contrail/environment/modules/contrail/manifests/params.pp | 4 ++-- .../openstack/examples/multinode_contrail/contrail.yaml | 2 +- .../modules/openstack/manifests/config/contrail.pp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrail/environment/modules/contrail/manifests/params.pp b/contrail/environment/modules/contrail/manifests/params.pp index 6358e099..a99a44d9 100644 --- a/contrail/environment/modules/contrail/manifests/params.pp +++ b/contrail/environment/modules/contrail/manifests/params.pp @@ -289,7 +289,7 @@ # # [*encap_priority*] # Encapsulation priority setting. -# (optional) - Defaults to "MPLSoUDP,MPLSoGRE,VXLAN" +# (optional) - Defaults to "VXLAN,MPLSoUDP,MPLSoGRE" # # [*router_asn*] # Router ASN value @@ -563,7 +563,7 @@ $keepalived_vrid = 100, $mysql_root_password = "c0ntrail123", $openstack_mgmt_ip_list = undef, - $encap_priority = "MPLSoUDP,MPLSoGRE,VXLAN", + $encap_priority = "VXLAN,MPLSoUDP,MPLSoGRE", $router_asn = "64512", $metadata_secret = "", $vgw_public_subnet = "", diff --git a/contrail/environment/modules/openstack/examples/multinode_contrail/contrail.yaml b/contrail/environment/modules/openstack/examples/multinode_contrail/contrail.yaml index 053faa95..8a0aa824 100644 --- a/contrail/environment/modules/openstack/examples/multinode_contrail/contrail.yaml +++ b/contrail/environment/modules/openstack/examples/multinode_contrail/contrail.yaml @@ -7,7 +7,7 @@ openstack::config::contrail::api_nworkers: "1" openstack::config::contrail::database_initial_token: "" openstack::config::contrail::bgp_params: "" openstack::config::contrail::supervisorctl_lines: 'supervisorctl -s http://localhost:9004 ${1} `basename ${0}:0`' -openstack::config::contrail::encap_priority: "MPLSoUDP,MPLSoGRE,VXLAN" +openstack::config::contrail::encap_priority: "VXLAN,MPLSoUDP,MPLSoGRE" openstack::config::contrail::multi_tenancy: "True" openstack::config::contrail::cassandra_ip_port: "9160" openstack::config::contrail::router_asn: "64512" diff --git a/contrail/environment/modules/openstack/manifests/config/contrail.pp b/contrail/environment/modules/openstack/manifests/config/contrail.pp index ed736855..6ce99b84 100644 --- a/contrail/environment/modules/openstack/manifests/config/contrail.pp +++ b/contrail/environment/modules/openstack/manifests/config/contrail.pp @@ -9,7 +9,7 @@ $database_initial_token = "", $bgp_params = "", $supervisorctl_lines = 'supervisorctl -s http://localhost:9004 ${1} `basename ${0}:0`', - $encap_priority = "MPLSoUDP,MPLSoGRE,VXLAN", + $encap_priority = "VXLAN,MPLSoUDP,MPLSoGRE", $rabbit_user = undef, $multi_tenancy = "True", $cassandra_ip_port = "9160",