From fc1feebcf5ecf67f4a1c4ac352c54e3ee4118855 Mon Sep 17 00:00:00 2001
From: Ilya Dmitrichenko <errordeveloper@gmail.com>
Date: Thu, 23 Apr 2015 11:43:09 +0100
Subject: [PATCH] coreos/azure: Parametrise registration label

---
 .../kubernetes-cluster-main-nodes-template.yml        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml
index 28a3af282f6..c83cccf630b 100644
--- a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml
+++ b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml
@@ -10,12 +10,18 @@ write_files:
       #!/bin/sh -xe
       minion_id="${1}"
       master_url="${2}"
+      env_label="${3}"
       until healthcheck=$(curl --fail --silent "${master_url}/healthz")
       do sleep 2
       done
       test -n "${healthcheck}"
       test "${healthcheck}" = "ok"
-      printf '{ "id": "%s", "kind": "Minion", "apiVersion": "v1beta1", "labels": { "environment": "production" }  }' "${minion_id}" \
+      printf '{
+        "id": "%s",
+        "kind": "Minion",
+        "apiVersion": "v1beta1",
+        "labels": { "environment": "%s" }
+        }' "${minion_id}" "${env_label}" \
         | /opt/bin/kubectl create -s "${master_url}" -f -
 
   - path: /etc/kubernetes/manifests/fluentd.manifest
@@ -169,6 +175,7 @@ coreos:
         Requires=docker.service
         Requires=install-weave.service
         [Service]
+        TimeoutStartSec=0
         EnvironmentFile=/etc/weave.%H.env
         ExecStartPre=/opt/bin/weave setup
         ExecStartPre=/opt/bin/weave launch $WEAVE_PEERS
@@ -354,7 +361,7 @@ coreos:
         Wants=download-kubernetes.service
         ConditionHost=!kube-00
         [Service]
-        ExecStart=/opt/bin/register_minion.sh %H http://kube-00:8080
+        ExecStart=/opt/bin/register_minion.sh %H http://kube-00:8080 production
         Type=oneshot
         [Install]
         WantedBy=kubernetes-minion.target