Merge pull request kubernetes#6382 from derekwaynecarr/fix_vagrant_ku…

…belet Fix vagrant with etcd in pod
duda · Apr 2, 2015 · 4ae016e · 4ae016e
2 parents 67c1678 + c6bf46a
commit 4ae016e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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