Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix ./cluster/kube-up.sh failed after vagrant halt. (issue #18990) #24324

Merged
merged 1 commit into from
Apr 21, 2016
+15 −2
Merged

fix ./cluster/kube-up.sh failed after vagrant halt. (issue #18990) #24324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions cluster/vagrant/provision-network-master.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ ETCD_INITIAL_ADVERTISE_PEER_URLS="http://${MASTER_IP}:4380"
ETCD_INITIAL_CLUSTER="flannel=http://${MASTER_IP}:4380"
ETCD_ADVERTISE_CLIENT_URLS="${FLANNEL_ETCD_URL}"
EOF

# fix the etcd boot failure issue
sed -i '/^Restart/a RestartSec=10' /usr/lib/systemd/system/etcd.service
systemctl daemon-reload

# Enable and start etcd
systemctl enable etcd
systemctl start etcd
Expand Down
12 changes: 10 additions & 2 deletions cluster/vagrant/provision-node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,17 @@ fi

write-salt-config kubernetes-pool

create-salt-kubelet-auth
create-salt-kubeproxy-auth
# Generate kubelet and kube-proxy auth file(kubeconfig) if there is not an existing one
known_kubeconfig_file="/srv/salt-overlay/salt/kubelet/kubeconfig"
if [[ ! -f "${known_kubeconfig_file}" ]]; then
create-salt-kubelet-auth
create-salt-kubeproxy-auth
else
# stop kubelet, let salt start it later
systemctl stop kubelet
fi

install-salt

run-salt