From c4ba90337cecb2e58777691bcd39599f8d201806 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Sat, 30 May 2015 11:07:19 -0400
Subject: [PATCH] Only install kube-master on the master and node on the nodes

---
 contrib/ansible/roles/kubernetes/tasks/main.yml | 9 ---------
 contrib/ansible/roles/master/tasks/main.yml     | 9 +++++++++
 contrib/ansible/roles/minion/tasks/main.yml     | 9 +++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/contrib/ansible/roles/kubernetes/tasks/main.yml b/contrib/ansible/roles/kubernetes/tasks/main.yml
index 55ff6a4b7b8..ac004f052b1 100644
--- a/contrib/ansible/roles/kubernetes/tasks/main.yml
+++ b/contrib/ansible/roles/kubernetes/tasks/main.yml
@@ -2,15 +2,6 @@
 - include: fedora.yml
   when: ansible_distribution == "Fedora"
 
-- name: Install kubernetes
-  action: "{{ ansible_pkg_mgr }}"
-  args:
-        name: kubernetes
-        state: latest
-  notify:
-        - restart daemons
-  when: not is_atomic
-
 - name: write the global config file
   template: src=config.j2 dest=/etc/kubernetes/config
   notify:
diff --git a/contrib/ansible/roles/master/tasks/main.yml b/contrib/ansible/roles/master/tasks/main.yml
index 1ef7be8789a..aadbbd4bd52 100644
--- a/contrib/ansible/roles/master/tasks/main.yml
+++ b/contrib/ansible/roles/master/tasks/main.yml
@@ -1,4 +1,13 @@
 ---
+- name: Install kubernetes
+  action: "{{ ansible_pkg_mgr }}"
+  args:
+        name: kubernetes-master
+        state: latest
+  notify:
+        - restart daemons
+  when: not is_atomic
+
 - name: write the config file for the api server
   template: src=apiserver.j2 dest=/etc/kubernetes/apiserver
   notify:
diff --git a/contrib/ansible/roles/minion/tasks/main.yml b/contrib/ansible/roles/minion/tasks/main.yml
index 2cafd18639a..a24d1293725 100644
--- a/contrib/ansible/roles/minion/tasks/main.yml
+++ b/contrib/ansible/roles/minion/tasks/main.yml
@@ -1,4 +1,13 @@
 ---
+- name: Install kubernetes
+  action: "{{ ansible_pkg_mgr }}"
+  args:
+        name: kubernetes-node
+        state: latest
+  notify:
+        - restart daemons
+  when: not is_atomic
+
 - name: write the config files for kubelet
   template: src=kubelet.j2 dest=/etc/kubernetes/kubelet
   notify: