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

Fix proxy and module_hotfixes (#6837)

Browse source 
This fixes the Containerd + EL8 case that was missed in 7d1ab3374e

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: Etienne Champetier <champetier.etienne@gmail.com>
This commit is contained in:
Etienne Champetier 2020-10-20 02:06:07 -04:00 committed by GitHub
parent 79b7f0d592
commit 03f316e7a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,5 +5,9 @@ enabled=1
gpgcheck={{ '1' if docker_rh_repo_gpgkey else '0' }} 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 %}
{% if ansible_os_family == "RedHat" and ansible_distribution_major_version|int == 8 %}module_hotfixes=True{% endif %} proxy={{ http_proxy }}
{% endif %}
{% if ansible_os_family == "RedHat" and ansible_distribution_major_version|int == 8 %}
module_hotfixes=True
{% endif %}

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

@ -5,6 +5,9 @@ enabled=1
gpgcheck={{ '1' if docker_rh_repo_gpgkey else '0' }} 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 }}
{% if ansible_os_family == "RedHat" and ansible_distribution_major_version|int == 8 %}module_hotfixes=True{% endif %} {% endif %}
{% if ansible_os_family == "RedHat" and ansible_distribution_major_version|int == 8 %}
module_hotfixes=True
{% endif %}