Merge pull request #30 from jan-g/issue_26_b

Correct flanneld settings

instances/k8smaster/scripts/flannel.service

@@ -5,11 +5,13 @@ Documentation=https://github.com/coreos/flannel
 [Service]
 Type=notify
 ExecStart=/usr/local/bin/flanneld \
+  -ip-masq=true \
   -iface $IP_LOCAL \
   -etcd-endpoints $ETCD_SERVER \
   -etcd-prefix /flannel/network
 Restart=always
 RestartSec=10
+After=docker.service kubelet.service
 
 [Install]
 WantedBy=multi-user.target

instances/k8smaster/scripts/setup.template.sh

@@ -114,6 +114,8 @@ systemctl start kubelet
 
 until kubectl get all; do sleep 1 && echo -n "."; done
 
+systemctl restart flannel
+
 ## Wait for k8s master to be available. There is a possible race on pod networks otherwise.
 until [ "$(curl localhost:8080/healthz 2>/dev/null)" == "ok" ]; do
 	sleep 3
@@ -125,4 +127,4 @@ kubectl create -f /root/services/kube-dns.yaml
 ## install kubernetes-dashboard
 kubectl create -f /root/services/kubernetes-dashboard.yaml
 
-echo "Finished running setup.sh"
+echo "Finished running setup.sh"

instances/k8sworker/scripts/flannel.service

@@ -5,11 +5,13 @@ Documentation=https://github.com/coreos/flannel
 [Service]
 Type=notify
 ExecStart=/usr/local/bin/flanneld \
+  -ip-masq=true \
   -iface $IP_LOCAL \
   -etcd-endpoints $ETCD_SERVER \
   -etcd-prefix /flannel/network
 Restart=always
 RestartSec=10
+After=docker.service kubelet.service
 
 [Install]
 WantedBy=multi-user.target

instances/k8sworker/scripts/setup.template.sh

@@ -151,5 +151,7 @@ systemctl daemon-reload
 systemctl enable kubelet
 systemctl start kubelet
 
+systemctl restart flannel
+
 ######################################
 echo "Finished running setup.sh"