Mount logic breaks if /var/lib/kubelet is a symlink

Pass the correct kubelet root-dir on AWS

cluster/aws/templates/format-disks.sh

@@ -75,5 +75,6 @@ else
   fi
   mkdir -p /mnt/kubelet
   ln -s /mnt/kubelet /var/lib/kubelet
+  KUBELET_ROOT="/mnt/kubelet"
 fi
 

cluster/aws/templates/salt-master.sh

@@ -38,6 +38,12 @@ if [[ -n "${DOCKER_ROOT}" ]]; then
 EOF
 fi
 
+if [[ -n "${KUBELET_ROOT}" ]]; then
+  cat <<EOF >>/etc/salt/minion.d/grains.conf
+  kubelet_root: '$(echo "$KUBELET_ROOT" | sed -e "s/'/''/g")'
+EOF
+fi
+
 # Auto accept all keys from minions that try to join
 mkdir -p /etc/salt/master.d
 cat <<EOF >/etc/salt/master.d/auto-accept.conf

cluster/aws/templates/salt-minion.sh

@@ -55,6 +55,12 @@ if [[ -n "${DOCKER_ROOT}" ]]; then
 EOF
 fi
 
+if [[ -n "${KUBELET_ROOT}" ]]; then
+  cat <<EOF >>/etc/salt/minion.d/grains.conf
+  kubelet_root: '$(echo "$KUBELET_ROOT" | sed -e "s/'/''/g")'
+EOF
+fi
+
 install-salt
 
 service salt-minion start