From 2050d7112bd09d171290ebd694f9fb9217352187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Mon, 23 May 2022 14:58:07 +0200 Subject: [PATCH] Simplify the Bodhi playbooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It should not actually change anything on the hosts. Signed-off-by: Aurélien Bompard --- playbooks/groups/bodhi-backend.yml | 10 +------- playbooks/openshift-apps/bodhi.yml | 5 ---- roles/bodhi2/base/templates/production.ini.j2 | 8 ++----- .../bodhi/templates/buildconfig.yml | 4 ---- .../bodhi/templates/deploymentconfig.yml | 12 ---------- .../bodhi/templates/dockerfile-base | 4 ++++ .../bodhi/templates/dockerfile-base.stg | 23 ------------------- 7 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 roles/openshift-apps/bodhi/templates/dockerfile-base.stg diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 917903bfcc..860e6a95eb 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -77,15 +77,7 @@ owner_user: apache owner_group: apache service: bodhi - host: "bodhi.fedoraproject.org" - when: env == "production" - - - role: keytab/service - owner_user: apache - owner_group: apache - service: bodhi - host: "bodhi.stg.fedoraproject.org" - when: env == "staging" + host: "bodhi{{ env_suffix }}.fedoraproject.org" - role: zabbix/zabbix_agent when: env == "staging" diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index 3328bb91c5..b22ae26ea6 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -23,11 +23,6 @@ - set_fact: args: bodhi_version: "{{ bodhi_version }}" - when: env == "staging" - - set_fact: - args: - bodhi_version: "{{ bodhi_version }}" - when: env == "production" roles: - role: rabbit/user diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 331378fe54..908ff7ff73 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -419,11 +419,7 @@ fmn_url = https://apps{{env_suffix}}.fedoraproject.org/notifications/ # krb_principal = # krb_keytab = # krb_ccache= -{% if env == 'staging' %} krb_ccache = /tmp/krb5cc_%%{uid} -{% else %} -krb_ccache = /tmp/krb5cc_%%{uid} -{% endif %} krb_principal = bodhi/bodhi{{ env_suffix }}.fedoraproject.org@{{ ipa_realm }} krb_keytab = /etc/krb5.bodhi_bodhi{{ env_suffix }}.fedoraproject.org.keytab @@ -669,8 +665,8 @@ openid.sreg_required = email nickname {% if env == 'staging' %} # OIDC (OpenID Connect) oidc.fedora.client_id = bodhi -oidc.fedora.client_secret = {{ bodhi2_oidc_client_secret_staging }} -oidc.fedora.server_metadata_url = http://id.stg.fedoraproject.org/openidc/.well-known/openid-configuration +oidc.fedora.client_secret = {{ (env == 'staging')|ternary(bodhi2_oidc_client_secret_staging, bodhi2_oidc_client_secret) }} +oidc.fedora.server_metadata_url = http://id{{ env_suffix }}.fedoraproject.org/openidc/.well-known/openid-configuration {% endif %} diff --git a/roles/openshift-apps/bodhi/templates/buildconfig.yml b/roles/openshift-apps/bodhi/templates/buildconfig.yml index 687bd452c9..558d02c023 100644 --- a/roles/openshift-apps/bodhi/templates/buildconfig.yml +++ b/roles/openshift-apps/bodhi/templates/buildconfig.yml @@ -11,11 +11,7 @@ items: runPolicy: Serial source: dockerfile: |- -{% if env == "staging" %} - {{ load_file('dockerfile-base.stg') | indent(8) }} -{% else %} {{ load_file('dockerfile-base') | indent(8) }} -{% endif %} type: Dockerfile strategy: type: Docker diff --git a/roles/openshift-apps/bodhi/templates/deploymentconfig.yml b/roles/openshift-apps/bodhi/templates/deploymentconfig.yml index c092c0dcae..4c7a85d747 100644 --- a/roles/openshift-apps/bodhi/templates/deploymentconfig.yml +++ b/roles/openshift-apps/bodhi/templates/deploymentconfig.yml @@ -8,11 +8,7 @@ items: service: web name: bodhi-web spec: -{% if env == "staging" %} replicas: {{ bodhi_openshift_pods }} -{% else %} - replicas: {{ bodhi_openshift_pods }} -{% endif %} selector: deploymentconfig: bodhi-web strategy: @@ -142,11 +138,7 @@ items: service: consumer name: bodhi-consumer spec: -{% if env == "staging" %} replicas: {{ bodhi_openshift_pods }} -{% else %} - replicas: {{ bodhi_openshift_pods }} -{% endif %} selector: deploymentconfig: bodhi-consumer strategy: @@ -239,11 +231,7 @@ items: service: celery name: bodhi-celery spec: -{% if env == "staging" %} replicas: {{ bodhi_openshift_pods }} -{% else %} - replicas: {{ bodhi_openshift_pods }} -{% endif %} selector: deploymentconfig: bodhi-celery strategy: diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base b/roles/openshift-apps/bodhi/templates/dockerfile-base index 33dd03eb3b..d6c6443764 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:35 +{% else %} FROM fedora:34 +{% endif %} LABEL \ name="bodhi-base" \ vendor="Fedora Infrastructure" \ diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base.stg b/roles/openshift-apps/bodhi/templates/dockerfile-base.stg deleted file mode 100644 index f83fa59843..0000000000 --- a/roles/openshift-apps/bodhi/templates/dockerfile-base.stg +++ /dev/null @@ -1,23 +0,0 @@ -FROM fedora:35 -LABEL \ - name="bodhi-base" \ - vendor="Fedora Infrastructure" \ - license="MIT" -{% if env == "staging" %} -RUN curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/fedora-infra-tags-stg.repo -{% else %} -RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/fedora-infra-tags.repo -{% endif %} -# While dnf has a --nodocs, it doesen't have a --docs... -RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf -{% if env == "staging" %} -RUN dnf install -y bodhi-server bodhi-docs python3-pyramid_sawing python3-gunicorn --refresh -{% else %} -RUN dnf install -y bodhi-server-{{bodhi_version}} bodhi-docs-{{bodhi_version}} python3-pyramid_sawing python3-gunicorn -{% endif %} - -# Set up krb5 -RUN rm -f /etc/krb5.conf && \ - ln -sf /etc/bodhi/krb5.conf /etc/krb5.conf && \ - ln -sf /etc/keytabs/koji-keytab /etc/krb5.bodhi_bodhi{{ env_suffix }}.fedoraproject.org.keytab -ENV USER=openshift