From d2972650c7f7a5ac23367b2820b64e5df706dfe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Wed, 27 Nov 2024 12:15:15 +0100 Subject: [PATCH] Fix Elections in staging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- playbooks/openshift-apps/elections.yml | 2 +- roles/openshift-apps/elections/templates/alembic.ini | 4 ++-- roles/openshift-apps/elections/templates/buildconfig.yml | 2 +- roles/openshift-apps/elections/templates/fedora-elections.cfg | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index da28fc5e11..8798b21540 100644 --- a/playbooks/openshift-apps/elections.yml +++ b/playbooks/openshift-apps/elections.yml @@ -13,7 +13,7 @@ - name: Elections DB user community.postgresql.postgresql_user: name: "{{ elections_db_user }}" - password: "{{ elections_db_pass }}" + password: "{{ (env == 'production') | ternary(elections_db_pass, elections_stg_db_pass) }}" - name: Elections database creation community.postgresql.postgresql_db: name: "{{ elections_db_name }}" diff --git a/roles/openshift-apps/elections/templates/alembic.ini b/roles/openshift-apps/elections/templates/alembic.ini index c7a520c367..a2e2385b4e 100644 --- a/roles/openshift-apps/elections/templates/alembic.ini +++ b/roles/openshift-apps/elections/templates/alembic.ini @@ -12,9 +12,9 @@ script_location = /opt/app-root/src/alembic # revision_environment = false {% if env == 'staging' %} -sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_stg_db_pass }}@db01.stg.iad2.fedoraproject.org/{{ elections_db_name }} +sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_stg_db_pass }}@db01.stg.iad2.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable {% else %} -sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01.iad2.fedoraproject.org/{{ elections_db_name }} +sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01.iad2.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable {% endif %} diff --git a/roles/openshift-apps/elections/templates/buildconfig.yml b/roles/openshift-apps/elections/templates/buildconfig.yml index 6a04a882ef..5274d6d0cd 100644 --- a/roles/openshift-apps/elections/templates/buildconfig.yml +++ b/roles/openshift-apps/elections/templates/buildconfig.yml @@ -24,7 +24,7 @@ spec: from: kind: ImageStreamTag namespace: openshift - name: python:3.6 + name: python:3.11-ubi9 triggers: - type: ConfigChange - type: ImageChange diff --git a/roles/openshift-apps/elections/templates/fedora-elections.cfg b/roles/openshift-apps/elections/templates/fedora-elections.cfg index 60e27c2b22..1cda174778 100644 --- a/roles/openshift-apps/elections/templates/fedora-elections.cfg +++ b/roles/openshift-apps/elections/templates/fedora-elections.cfg @@ -10,9 +10,9 @@ APPLICATION_ROOT = '/' ### url to the database server: {% if env == 'staging' %} -DB_URL='postgresql://{{ elections_db_user }}:{{ elections_stg_db_pass }}@db01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org/{{ elections_db_name }}' +DB_URL='postgresql://{{ elections_db_user }}:{{ elections_stg_db_pass }}@db01{{ env_suffix }}.iad2.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable' {% else %} -DB_URL='postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org/{{ elections_db_name }}' +DB_URL='postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01{{ env_suffix }}.iad2.fedoraproject.org/{{ elections_db_name }}?gssencmode=disable' {% endif %} ## One ore more FAS group that will have admin rights over the whole