diff --git a/roles/container-engine/cri-o/tasks/crio_repo.yml b/roles/container-engine/cri-o/tasks/crio_repo.yml index 8bd454ba8d1f6df04ca075fe52d5e0aab529f1c7..60cfae99f23043b2a38fea92b2e185639c3e2cb9 100644 --- a/roles/container-engine/cri-o/tasks/crio_repo.yml +++ b/roles/container-engine/cri-o/tasks/crio_repo.yml @@ -22,7 +22,7 @@ yum_repository: name: devel_kubic_libcontainers_stable 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 gpgkey: http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_$releasever/repodata/repomd.xml.key when: ansible_distribution in ["CentOS"] @@ -30,10 +30,10 @@ - name: Add CRI-O kubic repo yum_repository: name: "devel_kubic_libcontainers_stable_cri-o_{{ crio_version }}" - description: 1.17 (CentOS_$releasever) - baseurl: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_repo_path[crio_required_version] }}/CentOS_$releasever/" + description: "CRI-O {{ crio_version }} (CentOS_$releasever)" + baseurl: "http://widehat.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_$releasever/" 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"] - name: Enable modular repos for CRI-O diff --git a/roles/container-engine/cri-o/vars/centos-7.yml b/roles/container-engine/cri-o/vars/centos-7.yml index 29f69b37e8214fc903cbb778f4a437581c6cc779..740adbc6b11ff3b5139853e692b13282d17755dc 100644 --- a/roles/container-engine/cri-o/vars/centos-7.yml +++ b/roles/container-engine/cri-o/vars/centos-7.yml @@ -3,8 +3,3 @@ crio_packages: - cri-o - oci-systemd-hook - -crio_repo_path: - "1.18": "1.17:/1.17.4" - "1.17": "1.17:/1.17.4" - "1.16": "1.16" \ No newline at end of file diff --git a/roles/container-engine/cri-o/vars/centos-8.yml b/roles/container-engine/cri-o/vars/centos-8.yml index 943b091465bbf919443b2f6830697d74caaecc5b..1211808799c9db34be4c495f23445dbb81c6f94b 100644 --- a/roles/container-engine/cri-o/vars/centos-8.yml +++ b/roles/container-engine/cri-o/vars/centos-8.yml @@ -2,8 +2,3 @@ crio_packages: - cri-o - -crio_repo_path: - "1.18": "1.18:/1.18.0" - "1.17": "1.17:/1.17.4" - "1.16": "1.16" \ No newline at end of file