From bd9688d2be3b6161e06c263a385eec21070929b0 Mon Sep 17 00:00:00 2001
From: Andrew Donald Kennedy <andrew.kennedy@cloudsoftcorp.com>
Date: Tue, 6 Dec 2016 01:23:35 +0000
Subject: [PATCH] Move config of VXLAN as default to Flannel entity

---
 kubernetes/catalog/kubernetes/kubernetes.bom | 1 -
 kubernetes/catalog/kubernetes/plugins.bom    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kubernetes/catalog/kubernetes/kubernetes.bom b/kubernetes/catalog/kubernetes/kubernetes.bom
index 5a744f0a..54bf1d59 100644
--- a/kubernetes/catalog/kubernetes/kubernetes.bom
+++ b/kubernetes/catalog/kubernetes/kubernetes.bom
@@ -565,7 +565,6 @@ brooklyn.catalog:
           brooklyn.config:
             etcd.endpoints: $brooklyn:entity("etcd-cluster").attributeWhenReady("etcd.urls")
             flannel.network: $brooklyn:entity("kubernetes-cluster").config("kubernetes.pod.cidr")
-            flannel.transport: "vxlan"
         - type: docker-engine-with-resilience
           id: docker-engine
           name: "docker-engine"
diff --git a/kubernetes/catalog/kubernetes/plugins.bom b/kubernetes/catalog/kubernetes/plugins.bom
index 874d13c8..85dd9e00 100644
--- a/kubernetes/catalog/kubernetes/plugins.bom
+++ b/kubernetes/catalog/kubernetes/plugins.bom
@@ -42,7 +42,7 @@ brooklyn.catalog:
             The Flannel backend transport mechanism. Can be any of: 'udp',
             'vxlan', 'host-gw', 'aws-vpc', 'gce' or 'alloc'.
           type: string
-          default: "udp"
+          default: "vxlan"
         - name: flannel.interface
           label: "Flannel Interface"
           description: |
@@ -110,7 +110,7 @@ brooklyn.catalog:
           }
           EOF
           etcdctl --peers ${ETCD_ENDPOINTS} mk ${FLANNEL_ETCD_PREFIX}/config < flannel.json || etcdctl --peers ${ETCD_ENDPOINTS} get ${FLANNEL_ETCD_PREFIX}/config
-          
+
           sudo -E tee /etc/systemd/system/flannel.service <<-EOF
           [Unit]
           Description=Flannel Overlay Agent