From c4241fb2ae847487024df613cf1b071cf59772dd Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Fri, 3 Apr 2015 11:51:45 -0400
Subject: [PATCH] Use v1beta3 node definitions

---
 contrib/ansible/roles/master/tasks/main.yml   |  6 +++---
 .../ansible/roles/master/templates/node.j2    | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/contrib/ansible/roles/master/tasks/main.yml b/contrib/ansible/roles/master/tasks/main.yml
index fc44378ee55..4273505bb1a 100644
--- a/contrib/ansible/roles/master/tasks/main.yml
+++ b/contrib/ansible/roles/master/tasks/main.yml
@@ -24,13 +24,13 @@
   service: name=kube-scheduler enabled=yes state=started
 
 - name: Copy minion definition json files to master
-  template: src=node.j2 dest=/tmp/node-{{ item }}.yml
+  template: src=node.j2 dest=/tmp/node-{{ item }}.json
   changed_when: false
   with_items:
           groups['minions']
 
 - name: Load minion definition into master
-  command: /usr/bin/kubectl create -f /tmp/node-{{ item }}.yml
+  command: /usr/bin/kubectl create -f /tmp/node-{{ item }}.json
   register: command_result
   failed_when: command_result.rc != 0 and 'already exists' not in command_result.stderr
   changed_when: "command_result.rc == 0"
@@ -38,7 +38,7 @@
           groups['minions']
 
 - name: Delete minion definitions from master
-  file: path=/tmp/node-{{ item }}.yml state=absent
+  file: path=/tmp/node-{{ item }}.json state=absent
   changed_when: false
   with_items:
           groups['minions']
diff --git a/contrib/ansible/roles/master/templates/node.j2 b/contrib/ansible/roles/master/templates/node.j2
index 590de20f307..f96459f8e09 100644
--- a/contrib/ansible/roles/master/templates/node.j2
+++ b/contrib/ansible/roles/master/templates/node.j2
@@ -1,3 +1,16 @@
-apiVersion: v1beta1
-id: {{ item }}
-kind: Minion
+{
+    "apiVersion": "v1beta3",
+    "kind": "Node",
+    "metadata": {
+        "name": "{{ item }}"
+    },
+    "spec": {
+        "externalID": "{{ item }}"
+    },
+    "status": {
+        "capacity": {
+            "cpu": "1",
+            "memory": "1"
+        }
+    }
+}