From c14f7d7c56c482abefd2a92809484ba9fe977101 Mon Sep 17 00:00:00 2001
From: Kevin Lefevre <kevin.lefevre@osones.io>
Date: Thu, 13 Apr 2017 15:45:35 +0200
Subject: [PATCH] [k8s_coreos] update to etcdv3 and kube 1.6

Change-Id: I6314ca1483c85bfe8b4577449d4c2ed553be87d9
---
 .../k8s_coreos_v1/templates/fragments/configure-etcd.yaml | 8 +++++---
 magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

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 a66e32fd6c..8776941ec9 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml
@@ -25,7 +25,7 @@ write_files:
         KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
       fi
 
-      DROP_IN_FILE=/etc/systemd/system/etcd2.service.d/20-configure-etcd.conf
+      DROP_IN_FILE=/etc/systemd/system/etcd-member.service.d/20-configure-etcd.conf
       mkdir -p $(dirname $DROP_IN_FILE)
       protocol="https"
 
@@ -53,6 +53,8 @@ write_files:
       Environment=ETCD_PEER_CA_FILE=${KUBE_CERTS_PATH}/ca.pem
       Environment=ETCD_PEER_CERT_FILE=${KUBE_CERTS_PATH}/apiserver.pem
       Environment=ETCD_PEER_KEY_FILE=${KUBE_CERTS_PATH}/apiserver-key.pem
+      Environment="RKT_RUN_ARGS=--volume ssl,kind=host,source=${KUBE_CERTS_PATH} \
+      --mount volume=ssl,target=${KUBE_CERTS_PATH}"
       EOF
 
       fi
@@ -61,5 +63,5 @@ write_files:
           echo "Environment=ETCD_DISCOVERY_PROXY=$HTTP_PROXY" >> $DROP_IN_FILE
       fi
 
-      systemctl enable etcd2
-      systemctl --no-block start etcd2
+      systemctl enable etcd-member
+      systemctl --no-block start etcd-member
diff --git a/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml
index c10bcd4556..9ba942bd2c 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml
@@ -228,7 +228,7 @@ parameters:
   kube_version:
     type: string
     description: version of kubernetes used for kubernetes cluster
-    default: v1.5.2_coreos.1
+    default: v1.6.2_coreos.0
 
   kube_dashboard_version:
     type: string