From 085765c238bff0947db116afb6e1f83f4610874b Mon Sep 17 00:00:00 2001 From: Luke Repko Date: Tue, 6 Aug 2024 11:46:34 -0500 Subject: [PATCH] fix: install apache2-mod-wsgi after py3 --- Containerfiles/GnocchiRXT-Containerfile | 2 ++ base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Containerfiles/GnocchiRXT-Containerfile b/Containerfiles/GnocchiRXT-Containerfile index e1fd4f99..94e937a3 100644 --- a/Containerfiles/GnocchiRXT-Containerfile +++ b/Containerfiles/GnocchiRXT-Containerfile @@ -1,6 +1,7 @@ FROM ubuntu:22.04 ARG VERSION=4.6.2 ENV GNOCCHI_VERSION ${VERSION:-master} +ENV DEBIAN_FRONTEND=noninteractive RUN apt update RUN apt install -y build-essential software-properties-common git curl apache2 RUN add-apt-repository ppa:deadsnakes/ppa -y @@ -9,3 +10,4 @@ RUN apt install -y python3.10 python3.10-dev RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10 RUN pip install git+https://github.com/gnocchixyz/gnocchi.git@${GNOCCHI_VERSION} RUN mkdir /var/run/apache2 +RUN apt install -y libapache2-mod-wsgi-py3 diff --git a/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml b/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml index 4e21a1e4..b238c827 100644 --- a/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml +++ b/base-helm-configs/gnocchi/gnocchi-helm-overrides.yaml @@ -46,7 +46,7 @@ images: ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal ks_service: docker.io/openstackhelm/heat:wallaby-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:wallaby-ubuntu_focal - gnocchi_api: ghcr.io/lukerepko/genestack/gnocchi:4.6.2 + gnocchi_api: ghcr.io/lukerepko/genestack/gnocchi:4.6.2-1722962258 gnocchi_statsd: quay.io/openstack.kolla/ubuntu-source-gnocchi-statsd:yoga gnocchi_metricd: quay.io/openstack.kolla/ubuntu-source-gnocchi-metricd:yoga gnocchi_resources_cleaner: quay.io/openstack.kolla/ubuntu-source-gnocchi-base:yoga