From 299c02ebb25c0c7b607bb9f091a5a4ec126547e3 Mon Sep 17 00:00:00 2001
From: Mark Burnett <mark.m.burnett@gmail.com>
Date: Tue, 26 Sep 2017 07:43:26 -0500
Subject: [PATCH] Correctly pass calico interface to calico chart

Change-Id: I6d47438a7fcc8126d982b7671ada39ee2bc142b0
---
 .../kubernetes/armada-loader/assets/charts/calico/values.yaml  | 2 ++
 .../etc/kubernetes/armada-loader/assets/promenade-armada.yaml  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/assets/etc/kubernetes/armada-loader/assets/charts/calico/values.yaml b/assets/etc/kubernetes/armada-loader/assets/charts/calico/values.yaml
index 1badf59b..0e7473e5 100644
--- a/assets/etc/kubernetes/armada-loader/assets/charts/calico/values.yaml
+++ b/assets/etc/kubernetes/armada-loader/assets/charts/calico/values.yaml
@@ -1,4 +1,6 @@
 calico:
+  # Interface used with IP_AUTODETECTION_METHOD=interface=...
+  interface: null
   pod_ip_cidr: 10.97.0.0/16
   etcd:
     credentials:
diff --git a/promenade/templates/genesis/etc/kubernetes/armada-loader/assets/promenade-armada.yaml b/promenade/templates/genesis/etc/kubernetes/armada-loader/assets/promenade-armada.yaml
index bafe8b08..e8acb664 100644
--- a/promenade/templates/genesis/etc/kubernetes/armada-loader/assets/promenade-armada.yaml
+++ b/promenade/templates/genesis/etc/kubernetes/armada-loader/assets/promenade-armada.yaml
@@ -40,6 +40,9 @@ data:
   timeout: 600
   values:
     calico:
+      {%- if config['Network']['calico_interface'] is defined %}
+      interface: {{ config['Network']['calico_interface'] }}
+      {%- endif %}
       etcd:
         credentials:
           ca: |-