C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

disable gpgcheck if gpgkey is empty (#5621)

Browse source 
Signed-off-by: Chris Randles <randles.chris@gmail.com>
This commit is contained in:
Christopher Randles 2020-03-30 04:13:53 -04:00 committed by GitHub
parent b0a5f265e3
commit d439564a7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/container-engine/containerd/tasks/containerd_repo.yml
View file

@ -58,7 +58,7 @@
state: present state: present
baseurl: "{{ extras_rh_repo_base_url }}" baseurl: "{{ extras_rh_repo_base_url }}"
file: "extras" file: "extras"
gpgcheck: yes gpgcheck: "{{ 'yes' if extras_rh_repo_gpgkey else 'no' }}"
gpgkey: "{{ extras_rh_repo_gpgkey }}" gpgkey: "{{ extras_rh_repo_gpgkey }}"
keepcache: "{{ containerd_rpm_keepcache | default('1') }}" keepcache: "{{ containerd_rpm_keepcache | default('1') }}"
proxy: " {{ http_proxy | default('_none_') }}" proxy: " {{ http_proxy | default('_none_') }}"

2
roles/container-engine/containerd/templates/rh_containerd.repo.j2
View file

@ -2,7 +2,7 @@
name=Docker-CE Repository name=Docker-CE Repository
baseurl={{ docker_rh_repo_base_url }} baseurl={{ docker_rh_repo_base_url }}
enabled=1 enabled=1
gpgcheck=1 gpgcheck={{ '1' if docker_rh_repo_gpgkey else '0' }}
keepcache={{ docker_rpm_keepcache | default('1') }} keepcache={{ docker_rpm_keepcache | default('1') }}
gpgkey={{ docker_rh_repo_gpgkey }} gpgkey={{ docker_rh_repo_gpgkey }}
{% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %} {% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %}

2
roles/container-engine/docker/tasks/main.yml
View file

@ -120,7 +120,7 @@
state: present state: present
baseurl: "{{ extras_rh_repo_base_url }}" baseurl: "{{ extras_rh_repo_base_url }}"
file: "extras" file: "extras"
gpgcheck: yes gpgcheck: "{{ 'yes' if extras_rh_repo_gpgkey else 'no' }}"
gpgkey: "{{ extras_rh_repo_gpgkey }}" gpgkey: "{{ extras_rh_repo_gpgkey }}"
keepcache: "{{ docker_rpm_keepcache | default('1') }}" keepcache: "{{ docker_rpm_keepcache | default('1') }}"
proxy: " {{ http_proxy | default('_none_') }}" proxy: " {{ http_proxy | default('_none_') }}"

2
roles/container-engine/docker/templates/fedora_docker.repo.j2
View file

@ -2,6 +2,6 @@
name=Docker-CE Repository name=Docker-CE Repository
baseurl={{ docker_fedora_repo_base_url }} baseurl={{ docker_fedora_repo_base_url }}
enabled=1 enabled=1
gpgcheck=1 gpgcheck={{ '1' if docker_fedora_repo_gpgkey else '0' }}
gpgkey={{ docker_fedora_repo_gpgkey }} gpgkey={{ docker_fedora_repo_gpgkey }}
{% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %} {% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %}

2
roles/container-engine/docker/templates/rh_docker.repo.j2
View file

@ -2,7 +2,7 @@
name=Docker-CE Repository name=Docker-CE Repository
baseurl={{ docker_rh_repo_base_url }} baseurl={{ docker_rh_repo_base_url }}
enabled=1 enabled=1
gpgcheck=1 gpgcheck={{ '1' if docker_rh_repo_gpgkey else '0' }}
keepcache={{ docker_rpm_keepcache | default('1') }} keepcache={{ docker_rpm_keepcache | default('1') }}
gpgkey={{ docker_rh_repo_gpgkey }} gpgkey={{ docker_rh_repo_gpgkey }}
{% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %} {% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %}