From 5f8312bdb4ac5eb7f3ed39a7df505990da72fc9b Mon Sep 17 00:00:00 2001 From: Luke Repko Date: Tue, 6 Aug 2024 16:34:44 -0500 Subject: [PATCH] fix: sqlalchemy>2 has breaking changes e.g. `AttributeError: 'Engine' object has no attribute 'execute'` --- Containerfiles/GnocchiRXT-Containerfile | 3 ++- base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfiles/GnocchiRXT-Containerfile b/Containerfiles/GnocchiRXT-Containerfile index 0270ca9b..6906b9c9 100644 --- a/Containerfiles/GnocchiRXT-Containerfile +++ b/Containerfiles/GnocchiRXT-Containerfile @@ -31,7 +31,8 @@ RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10 RUN pip install \ "gnocchi[postgresql,ceph,keystone] @ git+https://github.com/gnocchixyz/gnocchi.git@${GNOCCHI_VERSION}" \ "pymemcache" \ - "pymysql" + "pymysql" \ + "sqlalchemy>=1.4.24,<2" RUN ln -s /usr/bin/python3 /usr/bin/python RUN adduser gnocchi --disabled-password RUN sed -i 's@^ErrorLog.*@ErrorLog /dev/stderr@' /etc/apache2/apache2.conf diff --git a/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml b/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml index 52e26172..6f0d5bd9 100644 --- a/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml +++ b/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml @@ -119,7 +119,6 @@ dependencies: db_sync: jobs: - gnocchi-storage-init - - gnocchi-db-init - gnocchi-db-init-indexer services: - endpoint: internal @@ -656,7 +655,7 @@ manifests: job_clean: true job_db_drop: false job_db_init_indexer: true - job_db_init: true + job_db_init: false job_image_repo_sync: true secret_db_indexer: true job_db_sync: true