Browse Source
Drop "Server" from crio repo URL (#7698) (#7699)
$releasever can be 7Server, but there is no such CentOS path on
download.opensuse.org.
Use ansible_distribution_major_version instead of $releasever.
pull/7700/head
Marko Kohtala
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
4 deletions
-
roles/container-engine/cri-o/tasks/crio_repo.yml
|
|
|
@ -75,9 +75,9 @@ |
|
|
|
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://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_{{ ansible_distribution_major_version }}/ |
|
|
|
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_{{ ansible_distribution_major_version }}/repodata/repomd.xml.key |
|
|
|
keepcache: '0' |
|
|
|
when: |
|
|
|
- ansible_os_family == "RedHat" |
|
|
|
@ -87,9 +87,9 @@ |
|
|
|
yum_repository: |
|
|
|
name: "devel_kubic_libcontainers_stable_cri-o_{{ crio_version }}" |
|
|
|
description: "CRI-O {{ crio_version }} (CentOS_$releasever)" |
|
|
|
baseurl: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_$releasever/" |
|
|
|
baseurl: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_{{ ansible_distribution_major_version }}/" |
|
|
|
gpgcheck: yes |
|
|
|
gpgkey: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_$releasever/repodata/repomd.xml.key" |
|
|
|
gpgkey: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_{{ ansible_distribution_major_version }}/repodata/repomd.xml.key" |
|
|
|
when: |
|
|
|
- ansible_os_family == "RedHat" |
|
|
|
- ansible_distribution not in ["Amazon", "Fedora"] |
|
|
|
|
