Merge branch 'feature/openstack-plugin' into develop

Author: pblaas

add_node.sh

@@ -77,6 +77,7 @@ sed -e "s,WORKER_IP,$i,g" \
 -e "s,ETCDCACERT,`cat index.txt|grep -w ETCDCACERT|cut -d: -f2`,g" \
 -e "s,ETCDWORKERKEY,`cat index.txt|grep -w ETCDWORKERKEY_$i|cut -d: -f2`,g" \
 -e "s,ETCDWORKER,`cat index.txt|grep -w ETCDWORKER_$i|cut -d: -f2`,g" \
+-e "s,CLOUDCONF,`cat index.txt|grep -w CLOUDCONF|cut -d: -f2`,g" \
 ../template/worker_proxy.yaml > node_$i.yaml
 echo Generated: node_$i.yaml
 done

create_cloudinit.sh

@@ -114,6 +114,7 @@ done
 
 ADMINKEY=`cat admin-key.pem | gzip | base64 -w0`
 ADMIN=`cat admin.pem | gzip | base64 -w0`
+CLOUDCONF=`cat ../../cloud.conf | gzip | base64 -w0`
 
 #create indexfile with hashes
 echo CAKEY:$CAKEY >> index.txt
@@ -124,6 +125,7 @@ echo APISERVERKEY:$APISERVERKEY >> index.txt
 echo APISERVER:$APISERVER >> index.txt
 echo ADMINKEY:$ADMINKEY >> index.txt
 echo ADMIN:$ADMIN >> index.txt
+echo CLOUDCONF:$CLOUDCONF >> index.txt
 
 #convert ssh public key to base64 gzip.
 UCK1=`echo $USER_CORE_KEY1 | gzip | base64 -w0`
@@ -147,6 +149,7 @@ sed -e "s,MASTER_HOST_FQDN,$MASTER_HOST_FQDN,g" \
 -e "s,ETCDCACERT,$ETCDCACERT,g" \
 -e "s,ETCDAPISERVERKEY,$ETCDAPISERVERKEY,g" \
 -e "s,ETCDAPISERVER,$ETCDAPISERVER,g" \
+-e "s,CLOUDCONF,$CLOUDCONF,g" \
 ../template/controller.yaml > node_$MASTER_HOST_IP.yaml
 echo ----------------------
 echo Generated: Master: node_$MASTER_HOST_IP.yaml
@@ -170,6 +173,7 @@ sed -e "s,WORKER_IP,$i,g" \
 -e "s,ETCDCACERT,$ETCDCACERT,g" \
 -e "s,ETCDWORKERKEY,`cat index.txt|grep -w ETCDWORKERKEY_$i|cut -d: -f2`,g" \
 -e "s,ETCDWORKER,`cat index.txt|grep -w ETCDWORKER_$i|cut -d: -f2`,g" \
+-e "s,CLOUDCONF,$CLOUDCONF,g" \
 ../template/worker.yaml > node_$i.yaml
 echo Generated: Worker: node_$i.yaml
 done

template/controller.yaml

@@ -84,7 +84,9 @@ coreos:
         --cluster_dns=CLUSTER_DNS \
         --cluster_domain=cluster.local \
         --client-ca-file=/etc/kubernetes/ssl/ca.pem \
-        --anonymous-auth=false
+        --anonymous-auth=false \
+        --cloud-provider=openstack \
+        --cloud-config=/etc/kubernetes/cloud.conf
         ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
         Restart=always
         RestartSec=10
@@ -285,6 +287,8 @@ write_files:
           - --kubelet-client-certificate=/etc/kubernetes/ssl/apiserver.pem
           - --kubelet-client-key=/etc/kubernetes/ssl/apiserver-key.pem
           - --anonymous-auth=false
+          - --cloud-provider=openstack
+          - --cloud-config=/etc/kubernetes/ssl/cloud.conf
           livenessProbe:
             httpGet:
               host: 127.0.0.1
@@ -364,6 +368,8 @@ write_files:
           - --leader-elect=true
           - --service-account-private-key-file=/etc/kubernetes/ssl/apiserver-key.pem
           - --root-ca-file=/etc/kubernetes/ssl/ca.pem
+          - --cloud-provider=openstack
+          - --cloud-config=/etc/kubernetes/ssl/cloud.conf
           resources:
             requests:
               cpu: 200m
@@ -471,6 +477,18 @@ write_files:
     owner: "root"
     content: |
       ETCDCACERT
+  - path: "/etc/kubernetes/cloud.conf"
+    permissions: "0664"
+    encoding: "gzip+base64"
+    owner: "root"
+    content: |
+      CLOUDCONF
+  - path: "/etc/kubernetes/ssl/cloud.conf"
+    permissions: "0664"
+    encoding: "gzip+base64"
+    owner: "root"
+    content: |
+      CLOUDCONF
   - path: /etc/motd.d/k8s.conf
     owner: "root"
     permissions: "0644"

template/worker.yaml

@@ -87,7 +87,9 @@ coreos:
         --tls-cert-file=/etc/kubernetes/ssl/worker.pem \
         --tls-private-key-file=/etc/kubernetes/ssl/worker-key.pem \
         --client-ca-file=/etc/kubernetes/ssl/ca.pem \
-        --anonymous-auth=false
+        --anonymous-auth=false \
+        --cloud-provider=openstack \
+        --cloud-config=/etc/kubernetes/ssl/cloud.conf
         ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
         Restart=always
         RestartSec=10
@@ -365,6 +367,12 @@ write_files:
     owner: "root"
     content: |
       ETCDWORKER
+  - path: "/etc/kubernetes/ssl/cloud.conf"
+    permissions: "0664"
+    encoding: "gzip+base64"
+    owner: "root"
+    content: |
+      CLOUDCONF
   - path: /etc/motd.d/k8s.conf
     owner: "root"
     permissions: "0644"

template/worker_proxy.yaml

@@ -87,7 +87,9 @@ coreos:
         --tls-cert-file=/etc/kubernetes/ssl/worker.pem \
         --tls-private-key-file=/etc/kubernetes/ssl/worker-key.pem \
         --client-ca-file=/etc/kubernetes/ssl/ca.pem \
-        --anonymous-auth=false
+        --anonymous-auth=false \
+        --cloud-provider=openstack \
+        --cloud-config=/etc/kubernetes/ssl/cloud.conf
         ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
         Restart=always
         RestartSec=10
@@ -365,6 +367,12 @@ write_files:
     owner: "root"
     content: |
       ETCDWORKER
+  - path: "/etc/kubernetes/ssl/cloud.conf"
+    permissions: "0664"
+    encoding: "gzip+base64"
+    owner: "root"
+    content: |
+      CLOUDCONF
   - path: /etc/motd.d/k8s.conf
     owner: "root"
     permissions: "0644"