From f6b6440b6f81c08b350f514d058d4969d806a2ea Mon Sep 17 00:00:00 2001 From: Adam Saleh Date: Fri, 7 May 2021 12:32:06 +0200 Subject: [PATCH] Updating bodhi on staging to run on f34. --- .../host_vars/bodhi-backend01.stg.iad2.fedoraproject.org | 4 ++-- roles/openshift-apps/bodhi/templates/dockerfile-base | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org index 4ffbb11b70..43c740f102 100644 --- a/inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.3.167.254 dns: 10.3.163.33 -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-34-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/x86_64/os/ volgroup: /dev/vg_guests mac_address: 52:54:00:1c:40:15 eth0_ip: 10.3.167.32 diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base b/roles/openshift-apps/bodhi/templates/dockerfile-base index 041213d2aa..478dc18a31 100644 --- a/roles/openshift-apps/bodhi/templates/dockerfile-base +++ b/roles/openshift-apps/bodhi/templates/dockerfile-base @@ -1,4 +1,8 @@ +{% if env == "staging" %} +FROM fedora:34 +{% else %} FROM fedora:32 +{% endif %} LABEL \ name="bodhi-base" \ vendor="Fedora Infrastructure" \