Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

mirrorlist: correctly handle different containers for staging

Browse source 
Signed-off-by: Adrian Reber <adrian@lisas.de>
This commit is contained in:
Adrian Reber 2019-11-11 15:10:39 +01:00 • committed by Pierre-Yves Chibon
parent 57352c2576
commit 052093cee0
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/mirrormanager/mirrorlist_proxy/defaults/main.yml
View file

@ -1,2 +1,2 @@
mirrorlist_container_image: "candidate-registry.fedoraproject.org/f29/mirrormanager2-mirrorlist:f29-container-candidate-80018-20190214185556"
mirrorlist_container_image: "quay.io/adrianreber/mirrorlist-server:1.0.0"
mirrorlist_container_image_stg: "quay.io/adrianreber/mirrorlist-server:1.0.0"

4
roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2
View file

@ -12,7 +12,11 @@ ExecStart=/usr/bin/podman run \
-v /usr/share/GeoIP:/usr/share/GeoIP \
-v /srv/mirrorlist/data/mirrorlist{{ item }}:/var/lib/mirrormanager \
-v /var/log/mirrormanager:/var/log/mirrormanager \
{% if env == "staging" %}
{{ mirrorlist_container_image_stg }} \
{% else %}
{{ mirrorlist_container_image }} \
{% endif %}
--port 1808{{ item }} \
--listen 127.0.0.1 \
-l /var/log/mirrormanager/%n.log