Merge "Register master node but make it non schedulable" into stable/newton

2016-09-28 21:03:48 +00:00 · 2016-09-28 21:03:48 +00:00 · 726da64a8f
parent a10b53fa77 52fd593e15
commit 726da64a8f
1 changed files with 2 additions and 1 deletions
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
@ -31,7 +31,8 @@ write_files:
      ExecStart=/usr/lib/coreos/kubelet-wrapper \
        --api_servers=http://127.0.0.1:8080 \
        --address=0.0.0.0 \
-        --register-node=false \
+        --register-node=true \
+        --register-schedulable=false \
        --allow-privileged=true \
        --config=/etc/kubernetes/manifests \
        --hostname-override=${myip} \