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