epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-09 19:58:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix CRI-O repos for centos distributions (#6224)

Browse Source 
* fix CRI-O repos for centos distributions

* fix CRI-O repos for centos distributions
- revert workarounds

* fix CRI-O repos for centos distributions
- use https for centos repos

* avoid 302 redirects for centos repos
This commit is contained in:
spaced
2020-06-04 10:08:44 +02:00
committed by GitHub
parent f2c8b393e1
commit 750db9139a
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/container-engine/cri-o/tasks/crio_repo.yml
View File

@@ -22,7 +22,7 @@
yum_repository: yum_repository:
name: devel_kubic_libcontainers_stable name: devel_kubic_libcontainers_stable
description: Stable Releases of Upstream github.com/containers packages (CentOS_$releasever) description: Stable Releases of Upstream github.com/containers packages (CentOS_$releasever)
baseurl: http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_$releasever/ baseurl: http://widehat.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_$releasever/
gpgcheck: yes gpgcheck: yes
gpgkey: http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_$releasever/repodata/repomd.xml.key gpgkey: http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_$releasever/repodata/repomd.xml.key
when: ansible_distribution in ["CentOS"] when: ansible_distribution in ["CentOS"]
@@ -30,10 +30,10 @@
- name: Add CRI-O kubic repo - name: Add CRI-O kubic repo
yum_repository: yum_repository:
name: "devel_kubic_libcontainers_stable_cri-o_{{ crio_version }}" name: "devel_kubic_libcontainers_stable_cri-o_{{ crio_version }}"
description: 1.17 (CentOS_$releasever) description: "CRI-O {{ crio_version }} (CentOS_$releasever)"
baseurl: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_repo_path[crio_required_version] }}/CentOS_$releasever/" baseurl: "http://widehat.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_$releasever/"
gpgcheck: yes gpgcheck: yes
gpgkey: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_repo_path[crio_required_version] }}/CentOS_$releasever/repodata/repomd.xml.key" gpgkey: "http://widehat.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_$releasever/repodata/repomd.xml.key"
when: ansible_distribution in ["CentOS"] when: ansible_distribution in ["CentOS"]
- name: Enable modular repos for CRI-O - name: Enable modular repos for CRI-O

5
roles/container-engine/cri-o/vars/centos-7.yml
View File

@@ -3,8 +3,3 @@
crio_packages: crio_packages:
- cri-o - cri-o
- oci-systemd-hook - oci-systemd-hook
crio_repo_path:
"1.18": "1.17:/1.17.4"
"1.17": "1.17:/1.17.4"
"1.16": "1.16"

5
roles/container-engine/cri-o/vars/centos-8.yml
View File

@@ -2,8 +2,3 @@
crio_packages: crio_packages:
- cri-o - cri-o
crio_repo_path:
"1.18": "1.18:/1.18.0"
"1.17": "1.17:/1.17.4"
"1.16": "1.16"