From 35452538f4f9337c2746bfcc4e39be51f8762264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= <lhuard@amadeus.com>
Date: Thu, 23 Apr 2015 18:22:00 +0200
Subject: [PATCH] Switch to etcd 2

---
 cluster/libvirt-coreos/user_data.yml        | 13 ++++++-------
 cluster/libvirt-coreos/user_data_master.yml |  6 +++---
 cluster/libvirt-coreos/user_data_minion.yml |  8 ++++----
 cluster/libvirt-coreos/util.sh              |  3 ++-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cluster/libvirt-coreos/user_data.yml b/cluster/libvirt-coreos/user_data.yml
index 4cbd93216eb..4616c24d44c 100644
--- a/cluster/libvirt-coreos/user_data.yml
+++ b/cluster/libvirt-coreos/user_data.yml
@@ -14,13 +14,12 @@ write_files:
       RuntimeMaxUse=50M
 
 coreos:
-  etcd:
-    name: ${name}
-    addr: ${public_ip}:4001
-    bind-addr: 0.0.0.0
-    peer-addr: ${public_ip}:7001
-    # peers: {etcd_peers}
+  etcd2:
     discovery: ${discovery}
+    advertise-client-urls: http://${public_ip}:2379
+    initial-advertise-peer-urls: http://${public_ip}:2380
+    listen-client-urls: http://0.0.0.0:2379
+    listen-peer-urls: http://${public_ip}:2380
   units:
     - name: static.network
       command: start
@@ -69,7 +68,7 @@ coreos:
         ExecStart=/usr/sbin/iptables -w -t nat -A POSTROUTING -o eth0 -j MASQUERADE ! -d ${CONTAINER_SUBNET}
         RemainAfterExit=yes
         Type=oneshot
-    - name: etcd.service
+    - name: etcd2.service
       command: start
     - name: docker.service
       command: start
diff --git a/cluster/libvirt-coreos/user_data_master.yml b/cluster/libvirt-coreos/user_data_master.yml
index cd48387b278..c34b034fe33 100644
--- a/cluster/libvirt-coreos/user_data_master.yml
+++ b/cluster/libvirt-coreos/user_data_master.yml
@@ -6,17 +6,17 @@ coreos:
       command: start
       content: |
         [Unit]
-        After=opt-kubernetes.mount etcd.service
+        After=opt-kubernetes.mount etcd2.service
         ConditionFileIsExecutable=/opt/kubernetes/bin/kube-apiserver
         Description=Kubernetes API Server
         Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-        Requires=opt-kubernetes.mount etcd.service
+        Requires=opt-kubernetes.mount etcd2.service
 
         [Service]
         ExecStart=/opt/kubernetes/bin/kube-apiserver \
         --address=0.0.0.0 \
         --port=8080 \
-        --etcd-servers=http://127.0.0.1:4001 \
+        --etcd-servers=http://127.0.0.1:2379 \
         --kubelet-port=10250 \
         --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}
         Restart=always
diff --git a/cluster/libvirt-coreos/user_data_minion.yml b/cluster/libvirt-coreos/user_data_minion.yml
index 5c9c5c9d8fe..7c80f9a9d96 100644
--- a/cluster/libvirt-coreos/user_data_minion.yml
+++ b/cluster/libvirt-coreos/user_data_minion.yml
@@ -6,11 +6,11 @@ coreos:
       command: start
       content: |
         [Unit]
-        After=opt-kubernetes.mount etcd.service docker.socket
+        After=opt-kubernetes.mount docker.socket
         ConditionFileIsExecutable=/opt/kubernetes/bin/kubelet
         Description=Kubernetes Kubelet
         Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-        Requires=opt-kubernetes.mount etcd.service docker.socket
+        Requires=opt-kubernetes.mount docker.socket
 
         [Service]
         ExecStart=/opt/kubernetes/bin/kubelet \
@@ -29,11 +29,11 @@ coreos:
       command: start
       content: |
         [Unit]
-        After=opt-kubernetes.mount etcd.service
+        After=opt-kubernetes.mount
         ConditionFileIsExecutable=/opt/kubernetes/bin/kube-proxy
         Description=Kubernetes Proxy
         Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-        Requires=opt-kubernetes.mount etcd.service
+        Requires=opt-kubernetes.mount
 
         [Service]
         ExecStart=/opt/kubernetes/bin/kube-proxy \
diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh
index fc3547e7f17..82284b53799 100644
--- a/cluster/libvirt-coreos/util.sh
+++ b/cluster/libvirt-coreos/util.sh
@@ -183,12 +183,13 @@ function wait-cluster-readiness {
 function kube-up {
   detect-master
   detect-minions
+  get-kubeconfig-bearertoken
   initialize-pool keep_base_image
   initialize-network
 
   readonly ssh_keys="$(cat ~/.ssh/id_*.pub | sed 's/^/  - /')"
   readonly kubernetes_dir="$POOL_PATH/kubernetes"
-  readonly discovery=$(curl -s https://discovery.etcd.io/new)
+  readonly discovery=$(curl -s https://discovery.etcd.io/new?size=$(($NUM_MINIONS+1)))
 
   readonly machines=$(join , "${KUBE_MINION_IP_ADDRESSES[@]}")