From b5531ddb2111a334cbf18218ce7921271884c971 Mon Sep 17 00:00:00 2001
From: ArchiFleKs <kevin.lefevre@osones.io>
Date: Mon, 24 Apr 2017 15:41:04 +0200
Subject: [PATCH] Add /etc/environment to flannel/etcd/kubelet

Everything is containerized in rkt. If behind proxy, flannel, etcd
and kubelet will failed to rkt fetch images and cluster creation
will failed.

Closes-Bug: #1689618
Change-Id: Ia12deeb659483980d2a20e4cba5d449167b600d0
---
 .../k8s_coreos_v1/templates/fragments/configure-etcd.yaml  | 1 +
 .../templates/fragments/enable-kubelet-master.yaml         | 1 +
 .../templates/fragments/enable-kubelet-minion.yaml         | 1 +
 .../templates/fragments/enable-network-service-client.yaml | 7 +++++++
 .../templates/fragments/enable-network-service.yaml        | 7 +++++++
 5 files changed, 17 insertions(+)

diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml
index 8776941ec9..ae2b588ce8 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml
@@ -34,6 +34,7 @@ write_files:
       fi
       cat > $DROP_IN_FILE <<EOF
       [Service]
+      EnvironmentFile=/etc/environment
       Environment=ETCD_NAME=$KUBE_NODE_IP
       Environment=ETCD_DATA_DIR=/var/lib/etcd/default.etcd
       Environment=ETCD_LISTEN_CLIENT_URLS=$protocol://$KUBE_NODE_IP:2379,http://127.0.0.1:2379
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
index 6d07cb01af..868c2f4cac 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
@@ -37,6 +37,7 @@ write_files:
       CONF_FILE=/etc/systemd/system/kubelet.service
       cat > $CONF_FILE <<EOF
       [Service]
+      EnvironmentFile=/etc/environment
       Environment=KUBELET_IMAGE_TAG=${KUBE_VERSION}
       Environment=KUBELET_IMAGE_REPO=${HYPERKUBE_IMAGE_REPO}
       Environment="RKT_RUN_ARGS=--uuid-file-save=${uuid_file} \
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml
index aa47eb237e..486ebd6a56 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml
@@ -49,6 +49,7 @@ write_files:
       CONF_FILE=/etc/systemd/system/kubelet.service
       cat > $CONF_FILE <<EOF
       [Service]
+      EnvironmentFile=/etc/environment
       Environment=KUBELET_VERSION=${KUBE_VERSION}
       Environment=KUBELET_ACI=${HYPERKUBE_IMAGE_REPO}
       Environment="RKT_OPTS=--uuid-file-save=${uuid_file} \
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service-client.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service-client.yaml
index e2b11c119d..56328d664b 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service-client.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service-client.yaml
@@ -60,6 +60,13 @@ write_files:
       ExecStartPre=/usr/bin/ln -sf /etc/flannel/options.env /run/flannel/options.env
       EOF
 
+      DROP_IN_FILE=/etc/systemd/system/flanneld.service.d/50-Environment.conf
+      mkdir -p $(dirname $DROP_IN_FILE)
+      cat > $DROP_IN_FILE <<EOF
+      [Service]
+      EnvironmentFile=/etc/environment
+      EOF
+
       DOCKER_FLANNEL_CONF=/etc/systemd/system/docker.service.d/40-flannel.conf
       mkdir -p $(dirname $DOCKER_FLANNEL_CONF)
       cat > $DOCKER_FLANNEL_CONF <<EOF
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service.yaml
index 8b3644427b..1bf75eb3d9 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service.yaml
@@ -44,6 +44,13 @@ write_files:
       ExecStartPre=/usr/bin/ln -sf /etc/flannel/options.env /run/flannel/options.env
       EOF
 
+      DROP_IN_FILE=/etc/systemd/system/flanneld.service.d/50-Environment.conf
+      mkdir -p $(dirname $DROP_IN_FILE)
+      cat > $DROP_IN_FILE <<EOF
+      [Service]
+      EnvironmentFile=/etc/environment
+      EOF
+
       DOCKER_FLANNEL_CONF=/etc/systemd/system/docker.service.d/40-flannel.conf
       mkdir -p $(dirname $DOCKER_FLANNEL_CONF)
       cat > $DOCKER_FLANNEL_CONF <<EOF