From f7b5d0db613ccbcf9f8b80fbfb0f91855225ccb9 Mon Sep 17 00:00:00 2001
From: Jeffrey Bean <jeffreyrobertbean@gmail.com>
Date: Thu, 2 Jul 2015 12:02:56 -0700
Subject: [PATCH] [Ansible] Adding new CentOS repo for newest Kubernetes
 packages.

This is the game we play until Kubernetes GA packages are out.
---
 .../roles/common/files/virt7-docker-common-candidate.repo  | 5 +++++
 contrib/ansible/roles/common/tasks/centos.yml              | 5 ++++-
 contrib/ansible/roles/master/tasks/centos.yml              | 4 ++--
 contrib/ansible/roles/node/tasks/centos.yml                | 7 +++++--
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 contrib/ansible/roles/common/files/virt7-docker-common-candidate.repo

diff --git a/contrib/ansible/roles/common/files/virt7-docker-common-candidate.repo b/contrib/ansible/roles/common/files/virt7-docker-common-candidate.repo
new file mode 100644
index 00000000000..492d67babff
--- /dev/null
+++ b/contrib/ansible/roles/common/files/virt7-docker-common-candidate.repo
@@ -0,0 +1,5 @@
+[virt7-docker-common-candidate]
+name=virt7-docker-common-candidate
+baseurl=http://cbs.centos.org/repos/virt7-docker-common-candidate/x86_64/os/
+enabled=0
+gpgcheck=0
diff --git a/contrib/ansible/roles/common/tasks/centos.yml b/contrib/ansible/roles/common/tasks/centos.yml
index 7d72d287d3e..05ebbc6048b 100644
--- a/contrib/ansible/roles/common/tasks/centos.yml
+++ b/contrib/ansible/roles/common/tasks/centos.yml
@@ -1,3 +1,6 @@
 ---
-- name: CentOS | Install Testing centos7 repo for new tool versions
+- name: CentOS | Install Testing centos7 repo
   copy: src=virt7-testing.repo dest=/etc/yum.repos.d/virt7-testing.repo
+
+- name: CentOS | Install docker-common-candidate centos7 repo
+  copy: src=virt7-docker-common-candidate.repo dest=/etc/yum.repos.d/virt7-docker-common-candidate.repo
diff --git a/contrib/ansible/roles/master/tasks/centos.yml b/contrib/ansible/roles/master/tasks/centos.yml
index 4564d18cf42..095000b5027 100644
--- a/contrib/ansible/roles/master/tasks/centos.yml
+++ b/contrib/ansible/roles/master/tasks/centos.yml
@@ -1,8 +1,8 @@
 ---
-- name: CentOS | Install kubernetes CentOS style
+- name: CentOS | Install kubernetes master 
   yum:
     pkg=kubernetes-master
     state=latest
-    enablerepo=virt7-testing
+    enablerepo=virt7-docker-common-candidate
   notify:
     - restart daemons
diff --git a/contrib/ansible/roles/node/tasks/centos.yml b/contrib/ansible/roles/node/tasks/centos.yml
index 638ab440ef0..577c6f84dd9 100644
--- a/contrib/ansible/roles/node/tasks/centos.yml
+++ b/contrib/ansible/roles/node/tasks/centos.yml
@@ -1,5 +1,8 @@
 ---
-- name: CentOS | Install kubernetes CentOS style
-  yum: pkg=kubernetes-node state=latest enablerepo=virt7-testing
+- name: CentOS | Install kubernetes node
+  yum:
+    pkg=kubernetes-node
+    state=latest
+    enablerepo=virt7-docker-common-candidate
   notify:
     - restart daemons