From d8093029fbf870783561ac1db38ce58b94e41151 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Sun, 22 Mar 2015 21:02:05 -0700 Subject: [PATCH] Merge heat-kubernetes pull request 16 Fix an incorrect option for starting kubelet which was stopping kubernetes from operating with new fedora atomic images. See: https://github.com/larsks/heat-kubernetes/pull/16/ Change-Id: Idfc276b39eb761727a4ecb87991e9866fab6692a Closes-bug: #1434468 --- .../heat-kubernetes/fragments/configure-kubernetes-minion.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh index e3dde31347..d80e6eca0a 100644 --- a/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh +++ b/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh @@ -16,6 +16,7 @@ sed -i ' sed -i ' /^KUBELET_ADDRESS=/ s/=.*/="--address=0.0.0.0"/ /^KUBELET_HOSTNAME=/ s/=.*/="--hostname_override='"$myip"'"/ +/^KUBELET_API_SERVER=/ s/=.*/="--api_servers='"$KUBE_MASTER_IP"':8080"/ ' /etc/kubernetes/kubelet sed -i '