Skip to content
Snippets Groups Projects
Unverified Commit 03f316e7 authored by Etienne Champetier's avatar Etienne Champetier Committed by GitHub
Browse files

Fix proxy and module_hotfixes (#6837)

This fixes the Containerd + EL8 case that was missed in 7d1ab337

On CentOS 8 with proxy ansible render inline `proxy` and `module_hotfixes` options.

For example:
```
proxy=http://127.0.0.1:3128module_hotfixes=True
```

But expected result:
```
proxy=http://127.0.0.1:3128


module_hotfixes=True
```

Signed-off-by: default avatarEtienne Champetier <champetier.etienne@gmail.com>
parent 79b7f0d5
No related branches found
No related tags found
No related merge requests found
......@@ -5,5 +5,9 @@ enabled=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 %}
{% if ansible_os_family == "RedHat" and ansible_distribution_major_version|int == 8 %}module_hotfixes=True{% endif %}
{% if http_proxy is defined %}
proxy={{ http_proxy }}
{% endif %}
{% if ansible_os_family == "RedHat" and ansible_distribution_major_version|int == 8 %}
module_hotfixes=True
{% endif %}
......@@ -5,6 +5,9 @@ enabled=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 %}
{% if ansible_os_family == "RedHat" and ansible_distribution_major_version|int == 8 %}module_hotfixes=True{% endif %}
{% if http_proxy is defined %}
proxy={{ http_proxy }}
{% endif %}
{% if ansible_os_family == "RedHat" and ansible_distribution_major_version|int == 8 %}
module_hotfixes=True
{% 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