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

@@ -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 = "",

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"

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",