diff --git a/contrib/ansible/roles/common/files/virt7-testing.repo b/contrib/ansible/roles/common/files/virt7-testing.repo new file mode 100644 index 00000000000..d1d3a04c3fc --- /dev/null +++ b/contrib/ansible/roles/common/files/virt7-testing.repo @@ -0,0 +1,5 @@ +[virt7-testing] +name=virt7-testing +baseurl=http://cbs.centos.org/repos/virt7-testing/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 new file mode 100644 index 00000000000..7d72d287d3e --- /dev/null +++ b/contrib/ansible/roles/common/tasks/centos.yml @@ -0,0 +1,3 @@ +--- +- name: CentOS | Install Testing centos7 repo for new tool versions + copy: src=virt7-testing.repo dest=/etc/yum.repos.d/virt7-testing.repo diff --git a/contrib/ansible/roles/common/tasks/main.yml b/contrib/ansible/roles/common/tasks/main.yml index 5404be01616..caccf33d6a5 100644 --- a/contrib/ansible/roles/common/tasks/main.yml +++ b/contrib/ansible/roles/common/tasks/main.yml @@ -16,3 +16,6 @@ # collect information about what packages are installed - include: rpm.yml when: ansible_pkg_mgr == "yum" + +- include: centos.yml + when: ansible_distribution == "CentOS" diff --git a/contrib/ansible/roles/master/tasks/centos.yml b/contrib/ansible/roles/master/tasks/centos.yml new file mode 100644 index 00000000000..88777cd2545 --- /dev/null +++ b/contrib/ansible/roles/master/tasks/centos.yml @@ -0,0 +1,5 @@ +--- +- name: CentOS | Install kubernetes CentOS style + yum: pkg=kubernetes state=latest enablerepo=virt7-testing + notify: + - restart daemons diff --git a/contrib/ansible/roles/master/tasks/generic-install.yml b/contrib/ansible/roles/master/tasks/generic-install.yml new file mode 100644 index 00000000000..6e69dbf3f63 --- /dev/null +++ b/contrib/ansible/roles/master/tasks/generic-install.yml @@ -0,0 +1,7 @@ +- name: Install kubernetes + action: "{{ ansible_pkg_mgr }}" + args: + name: kubernetes-master + state: latest + notify: + - restart daemons diff --git a/contrib/ansible/roles/master/tasks/main.yml b/contrib/ansible/roles/master/tasks/main.yml index d5b66204b7c..5ee28e74b80 100644 --- a/contrib/ansible/roles/master/tasks/main.yml +++ b/contrib/ansible/roles/master/tasks/main.yml @@ -1,12 +1,9 @@ --- -- name: Install kubernetes - action: "{{ ansible_pkg_mgr }}" - args: - name: kubernetes-master - state: latest - notify: - - restart daemons - when: not is_atomic +- include: generic-install.yml + when: not is_atomic and not ansible_distribution == "CentOS" + +- include: centos.yml + when: not is_atomic and ansible_distribution == "CentOS" - name: write the config file for the api server template: src=apiserver.j2 dest=/etc/kubernetes/apiserver diff --git a/contrib/ansible/roles/node/tasks/centos.yml b/contrib/ansible/roles/node/tasks/centos.yml new file mode 100644 index 00000000000..88777cd2545 --- /dev/null +++ b/contrib/ansible/roles/node/tasks/centos.yml @@ -0,0 +1,5 @@ +--- +- name: CentOS | Install kubernetes CentOS style + yum: pkg=kubernetes state=latest enablerepo=virt7-testing + notify: + - restart daemons diff --git a/contrib/ansible/roles/node/tasks/generic-install.yml b/contrib/ansible/roles/node/tasks/generic-install.yml new file mode 100644 index 00000000000..b3597237141 --- /dev/null +++ b/contrib/ansible/roles/node/tasks/generic-install.yml @@ -0,0 +1,7 @@ +- name: Install kubernetes + action: "{{ ansible_pkg_mgr }}" + args: + name: kubernetes-node + state: latest + notify: + - restart daemons diff --git a/contrib/ansible/roles/node/tasks/main.yml b/contrib/ansible/roles/node/tasks/main.yml index 501b3399c66..00046f7bea7 100644 --- a/contrib/ansible/roles/node/tasks/main.yml +++ b/contrib/ansible/roles/node/tasks/main.yml @@ -1,12 +1,9 @@ --- -- name: Install kubernetes - action: "{{ ansible_pkg_mgr }}" - args: - name: kubernetes-node - state: latest - notify: - - restart daemons - when: not is_atomic +- include: generic-install.yml + when: not is_atomic and not ansible_distribution == "CentOS" + +- include: centos.yml + when: not is_atomic and ansible_distribution == "CentOS" - name: write the config files for kubelet template: src=kubelet.j2 dest=/etc/kubernetes/kubelet