From e6e86f71631d7280fd8dcf9ac472f338acc01a61 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Sun, 22 Mar 2015 16:41:03 -0700
Subject: [PATCH] Merge heat-kubernetes pull request 14

Pull request 14 changes the start order of Kubernetes.  The master
now starts first, and the minion starts after the master completes.

This prevents flanneld in the minions from timing out and failing to
start the kubernetes services on the minions.

See:
https://github.com/larsks/heat-kubernetes/pull/14/

Change-Id: Ia823fd3593dc7c5d9d9c6327e009b833ad586a5c
Closes-bug: #1434468
---
 .../fragments/configure-kubernetes-master.sh              | 2 +-
 .../fragments/configure-kubernetes-minion.sh              | 8 ++++++++
 .../fragments/write-heat-params-master.yaml               | 1 -
 magnum/templates/heat-kubernetes/kubecluster.yaml         | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-master.sh b/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-master.sh
index 7b71d636bd..d34196d544 100644
--- a/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-master.sh
+++ b/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-master.sh
@@ -14,6 +14,6 @@ sed -i '
 ' /etc/kubernetes/apiserver
 
 sed -i '
-  /^KUBELET_ADDRESSES=/ s/=.*/="--machines='"$MINION_ADDRESSES"'"/
+  /^KUBELET_ADDRESSES=/ s/=.*/="--machines='""'"/
 ' /etc/kubernetes/controller-manager
 
diff --git a/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh
index 0d916edcf4..e3dde31347 100644
--- a/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh
+++ b/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh
@@ -29,3 +29,11 @@ sed -i '
 cat >> /etc/environment <<EOF
 KUBERNETES_MASTER=http://$KUBE_MASTER_IP:8080
 EOF
+
+cpu=$(expr $(nproc) \* 1000)
+memory_kb=$(cat /proc/meminfo | awk '/MemTotal: /{print $2}')
+memory=$(expr $memory_kb \* 1024)
+curl -sf -X POST -H 'Content-Type: application/json' \
+    --data-binary "{'kind':'Minion','id':'$myip','apiVersion':'v1beta1',
+        'resources':{'capacity':{'cpu':$cpu,'memory':$memory}}}" \
+    http://$KUBE_MASTER_IP:8080/api/v1beta1/minions
diff --git a/magnum/templates/heat-kubernetes/fragments/write-heat-params-master.yaml b/magnum/templates/heat-kubernetes/fragments/write-heat-params-master.yaml
index 0def1239e4..853b2d78c7 100644
--- a/magnum/templates/heat-kubernetes/fragments/write-heat-params-master.yaml
+++ b/magnum/templates/heat-kubernetes/fragments/write-heat-params-master.yaml
@@ -5,7 +5,6 @@ write_files:
     owner: "root:root"
     permissions: "0644"
     content: |
-      MINION_ADDRESSES="$MINION_ADDRESSES"
       KUBE_ALLOW_PRIV="$KUBE_ALLOW_PRIV"
       WAIT_HANDLE="$WAIT_HANDLE"
       FLANNEL_NETWORK_CIDR="$FLANNEL_NETWORK_CIDR"
diff --git a/magnum/templates/heat-kubernetes/kubecluster.yaml b/magnum/templates/heat-kubernetes/kubecluster.yaml
index e72afa91d4..9199df5163 100644
--- a/magnum/templates/heat-kubernetes/kubecluster.yaml
+++ b/magnum/templates/heat-kubernetes/kubecluster.yaml
@@ -193,7 +193,6 @@ resources:
         str_replace:
           template: {get_file: fragments/write-heat-params-master.yaml}
           params:
-            "$MINION_ADDRESSES": {"Fn::Join": [",", {get_attr: [kube_minions, kube_node_ip]}]}
             "$KUBE_ALLOW_PRIV": {get_param: kube_allow_priv}
             "$WAIT_HANDLE": {get_resource: master_wait_handle}
             "$FLANNEL_NETWORK_CIDR": {get_param: flannel_network_cidr}
@@ -311,6 +310,7 @@ resources:
     type: "OS::Heat::ResourceGroup"
     depends_on:
       - extrouter_inside
+      - master_wait_condition
     properties:
       count: {get_param: number_of_minions}
       resource_def: