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

Rebase Bodhi on F35 in staging

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2022-04-13 08:32:16 +02:00
parent 2a72de4558
commit 6c43fb870b
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
3 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
roles/bodhi2/base/templates/httpd.conf.j2
View file

@ -68,3 +68,6 @@ WSGIRestrictStdout Off
WSGIRestrictSignal Off
WSGIPythonOptimize 1
WSGIScriptAlias / /usr/share/bodhi/bodhi.wsgi
{% if env == "staging" %}
WSGIPassAuthorization On
{% endif %}

2
roles/openshift-apps/bodhi/templates/buildconfig.yml
View file

@ -12,7 +12,7 @@ items:
source:
dockerfile: |-
{% if env == "staging" %}
{{ load_file('dockerfile-base') | indent(8) }}
{{ load_file('dockerfile-base.stg') | indent(8) }}
{% else %}
{{ load_file('dockerfile-base') | indent(8) }}
{% endif %}

23
roles/openshift-apps/bodhi/templates/dockerfile-base.stg Normal file
View file

@ -0,0 +1,23 @@
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