From a1fe9c5750de05ae91f1cc8b7ba3af512482d578 Mon Sep 17 00:00:00 2001
From: Luke Repko <luke.repko@rackspace.com>
Date: Wed, 7 Aug 2024 15:01:44 -0500
Subject: [PATCH] fix: add additional requirements for ceilometer

---
 Containerfiles/CeilometerRXT-Containerfile            | 11 ++++++-----
 .../ceilometer/ceilometer-helm-overrides.yaml         |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Containerfiles/CeilometerRXT-Containerfile b/Containerfiles/CeilometerRXT-Containerfile
index da2990d7..0c2713f1 100644
--- a/Containerfiles/CeilometerRXT-Containerfile
+++ b/Containerfiles/CeilometerRXT-Containerfile
@@ -9,17 +9,18 @@ RUN apt update && \
     apt install -y \
     python3.10 \
     python3.10-dev \
+    python3-memcache \
     git \
     wget \
     curl \
-    apache2 \
     locales \
-    libapache2-mod-wsgi-py3 \
-    build-essential
+    build-essential \
+    pkg-config \
+    libvirt-dev
 RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10 && \
     pip install \
-    "ceilometer @ git+https://opendev.org/openstack/ceilometer.git@${CEILOMETER_VERSION}"
+    "ceilometer @ git+https://opendev.org/openstack/ceilometer.git@${CEILOMETER_VERSION}" \
+    "libvirt-python"
 RUN ln -s /usr/bin/python3 /usr/bin/python && \
     adduser ceilometer --disabled-password && \
-    sed -i 's@^ErrorLog.*@ErrorLog /dev/stderr@' /etc/apache2/apache2.conf && \
     apt clean && rm -rf /var/lib/apt/lists/*
diff --git a/base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml b/base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml
index a576b970..06ed3cea 100644
--- a/base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml
+++ b/base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml
@@ -34,7 +34,7 @@ images:
     ceilometer_notification: ghcr.io/lukerepko/genestack/ceilometer:2024.1-ubuntu_jammy
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
-  pull_policy: "IfNotPresent"
+  pull_policy: "Always"
   local_registry:
     active: false
     exclude: