Fix vagrant with etcd in pod

This commit is contained in:
derekwaynecarr
2015-04-02 16:55:29 -04:00
parent acdce749a3
commit c6bf46acd7
5 changed files with 5 additions and 3 deletions

View File

@@ -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

View File

@@ -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