commit 2645443b12e7a6dbc2fb117bca8da40170f4301d
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Oct 18 17:40:13 2017 +0000
committer Gerrit Code Review <gerrit2@7cd0c2eb159e> Wed Oct 18 17:40:13 2017 +0000
tree 1088613e50b9a00152a6c0fbf5e5b7620ffbb8de
parent b00e05eaaafa1c4af802937c56c8a97906bf3c93
parent a8e5b473888008a85bdff784f45505b3648455c8

Merge changes Idf2805d8,I185e37d1

* changes:
  Remove ppa uplpad for salt-formula packages on trusty
  Change trigger for nightly opencontrail build

opencontrail/client/resource/global_vrouter_config.yml

diff --git a/opencontrail/client/resource/global_vrouter_config.yml b/opencontrail/client/resource/global_vrouter_config.yml
new file mode 100644
index 0000000..0d86703
--- /dev/null
+++ b/opencontrail/client/resource/global_vrouter_config.yml
@@ -0,0 +1,11 @@
+parameters:
+  opencontrail:
+    client:
+      global_vrouter_config:
+        name: global-vrouter-config
+        parent_type: global-system-config
+        encap_priority: "MPLSoUDP,MPLSoGRE"
+        vxlan_vn_id_mode: automatic
+        fq_names:
+          - 'default-global-system-config'
+          - 'default-global-vrouter-config