Browse Source
disable gpgcheck if gpgkey is empty (#5621)
Signed-off-by: Chris Randles <randles.chris@gmail.com>
pull/5858/head
Christopher Randles
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
5 additions and
5 deletions
-
roles/container-engine/containerd/tasks/containerd_repo.yml
-
roles/container-engine/containerd/templates/rh_containerd.repo.j2
-
roles/container-engine/docker/tasks/main.yml
-
roles/container-engine/docker/templates/fedora_docker.repo.j2
-
roles/container-engine/docker/templates/rh_docker.repo.j2
|
|
@ -58,7 +58,7 @@ |
|
|
|
state: present |
|
|
|
baseurl: "{{ extras_rh_repo_base_url }}" |
|
|
|
file: "extras" |
|
|
|
gpgcheck: yes |
|
|
|
gpgcheck: "{{ 'yes' if extras_rh_repo_gpgkey else 'no' }}" |
|
|
|
gpgkey: "{{ extras_rh_repo_gpgkey }}" |
|
|
|
keepcache: "{{ containerd_rpm_keepcache | default('1') }}" |
|
|
|
proxy: " {{ http_proxy | default('_none_') }}" |
|
|
|
|
|
@ -2,7 +2,7 @@ |
|
|
|
name=Docker-CE Repository |
|
|
|
baseurl={{ docker_rh_repo_base_url }} |
|
|
|
enabled=1 |
|
|
|
gpgcheck=1 |
|
|
|
gpgcheck={{ '1' if docker_rh_repo_gpgkey else '0' }} |
|
|
|
keepcache={{ docker_rpm_keepcache | default('1') }} |
|
|
|
gpgkey={{ docker_rh_repo_gpgkey }} |
|
|
|
{% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %} |
|
|
|
|
|
@ -120,7 +120,7 @@ |
|
|
|
state: present |
|
|
|
baseurl: "{{ extras_rh_repo_base_url }}" |
|
|
|
file: "extras" |
|
|
|
gpgcheck: yes |
|
|
|
gpgcheck: "{{ 'yes' if extras_rh_repo_gpgkey else 'no' }}" |
|
|
|
gpgkey: "{{ extras_rh_repo_gpgkey }}" |
|
|
|
keepcache: "{{ docker_rpm_keepcache | default('1') }}" |
|
|
|
proxy: " {{ http_proxy | default('_none_') }}" |
|
|
|
|
|
@ -2,6 +2,6 @@ |
|
|
|
name=Docker-CE Repository |
|
|
|
baseurl={{ docker_fedora_repo_base_url }} |
|
|
|
enabled=1 |
|
|
|
gpgcheck=1 |
|
|
|
gpgcheck={{ '1' if docker_fedora_repo_gpgkey else '0' }} |
|
|
|
gpgkey={{ docker_fedora_repo_gpgkey }} |
|
|
|
{% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %} |
|
|
@ -2,7 +2,7 @@ |
|
|
|
name=Docker-CE Repository |
|
|
|
baseurl={{ docker_rh_repo_base_url }} |
|
|
|
enabled=1 |
|
|
|
gpgcheck=1 |
|
|
|
gpgcheck={{ '1' if docker_rh_repo_gpgkey else '0' }} |
|
|
|
keepcache={{ docker_rpm_keepcache | default('1') }} |
|
|
|
gpgkey={{ docker_rh_repo_gpgkey }} |
|
|
|
{% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %} |
|
|
|