From c6bf46acd770dc71f11c9afa7a9d9556bab3558c Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Thu, 2 Apr 2015 16:55:29 -0400
Subject: [PATCH] Fix vagrant with etcd in pod

---
 cluster/saltbase/salt/kubelet/kubelet.service | 2 +-
 cluster/saltbase/salt/sdn/init.sls            | 1 +
 cluster/saltbase/salt/top.sls                 | 1 +
 cluster/vagrant/provision-network.sh          | 1 +
 cluster/vagrant/util.sh                       | 3 +--
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cluster/saltbase/salt/kubelet/kubelet.service b/cluster/saltbase/salt/kubelet/kubelet.service
index b277ff89244..e5ffdb0804d 100644
--- a/cluster/saltbase/salt/kubelet/kubelet.service
+++ b/cluster/saltbase/salt/kubelet/kubelet.service
@@ -7,7 +7,7 @@ Requires=docker.service
 [Service]
 EnvironmentFile=/etc/sysconfig/kubelet
 ExecStart=/usr/local/bin/kubelet "$DAEMON_ARGS"
-Restart=on-failure
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/cluster/saltbase/salt/sdn/init.sls b/cluster/saltbase/salt/sdn/init.sls
index ca9d196030f..415e764d98a 100644
--- a/cluster/saltbase/salt/sdn/init.sls
+++ b/cluster/saltbase/salt/sdn/init.sls
@@ -6,6 +6,7 @@ sdn:
     - source: /kubernetes-vagrant/network_closure.sh
     - require:
       - pkg: docker-io
+      - sls: kubelet
     - cwd: /
     - user: root
     - group: root
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index 65834fd458e..c6d5bf21521 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -45,6 +45,7 @@ base:
 {% endif %}
 {% if grains['cloud'] is defined and grains['cloud'] == 'vagrant' %}
     - docker
+    - kubelet
     - sdn
 {% endif %}
 {% if grains['cloud'] is defined and grains['cloud'] == 'aws' %}
diff --git a/cluster/vagrant/provision-network.sh b/cluster/vagrant/provision-network.sh
index 078382d1292..c79d2d9b0ae 100755
--- a/cluster/vagrant/provision-network.sh
+++ b/cluster/vagrant/provision-network.sh
@@ -90,6 +90,7 @@ ifconfig | grep -q kbr0 || {
   echo "OPTIONS='-b=kbr0 --selinux-enabled ${DOCKER_OPTS}'" >/etc/sysconfig/docker
   systemctl daemon-reload
   systemctl start docker
+  systemctl restart kubelet
 
 }
 EOF
diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh
index 84501258942..c61dfbfe79a 100644
--- a/cluster/vagrant/util.sh
+++ b/cluster/vagrant/util.sh
@@ -124,7 +124,7 @@ function verify-cluster {
   # verify master has all required daemons
   echo "Validating master"
   local machine="master"
-  local -a required_daemon=("salt-master" "salt-minion" "kube-apiserver" "nginx" "kube-controller-manager" "kube-scheduler")
+  local -a required_daemon=("salt-master" "salt-minion" "kube-apiserver" "nginx" "kube-controller-manager" "kube-scheduler" "kubelet")
   local validated="1"
   until [[ "$validated" == "0" ]]; do
     validated="0"
@@ -191,7 +191,6 @@ function verify-cluster {
     )
 }
 
-
 # Instantiate a kubernetes cluster
 function kube-up {
   get-password