Skip to content
Snippets Groups Projects
Unverified Commit d439564a authored by Christopher Randles's avatar Christopher Randles Committed by GitHub
Browse files

disable gpgcheck if gpgkey is empty (#5621)

parent b0a5f265
No related branches found
No related tags found
No related merge requests found
...@@ -58,7 +58,7 @@ ...@@ -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,7 +2,7 @@ ...@@ -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 %}
......
...@@ -120,7 +120,7 @@ ...@@ -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,6 +2,6 @@ ...@@ -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,7 +2,7 @@ ...@@ -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 %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment