From aa0a5c9c3d5261b94e0ac7e50b3987ba9a1a3c50 Mon Sep 17 00:00:00 2001
From: dengzhaosen <jorhson_deng@163.com>
Date: Tue, 26 Mar 2024 15:52:51 +0800
Subject: [PATCH] Add 2023.2 Ubuntu Jammy overrides

Change-Id: Ia23370d07faf1f8a1e05447459ce9872e8d4e875
---
 gnocchi/Chart.yaml                            |  2 +-
 gnocchi/templates/deployment-api.yaml         |  2 +
 gnocchi/values.yaml                           |  1 +
 .../values_overrides/2023.2-ubuntu-jammy.yaml | 37 +++++++++++++++++++
 releasenotes/notes/gnocchi.yaml               |  1 +
 5 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 gnocchi/values_overrides/2023.2-ubuntu-jammy.yaml

diff --git a/gnocchi/Chart.yaml b/gnocchi/Chart.yaml
index 012b64a67..308aead90 100644
--- a/gnocchi/Chart.yaml
+++ b/gnocchi/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v3.0.3
 description: OpenStack-Helm Gnocchi
 name: gnocchi
-version: 0.1.14
+version: 0.1.15
 home: https://gnocchi.xyz/
 icon: https://gnocchi.xyz/_static/gnocchi-logo.png
 sources:
diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml
index bb800802b..68555b184 100644
--- a/gnocchi/templates/deployment-api.yaml
+++ b/gnocchi/templates/deployment-api.yaml
@@ -98,10 +98,12 @@ spec:
               mountPath: /etc/gnocchi/gnocchi.conf
               subPath: gnocchi.conf
               readOnly: true
+            {{- if .Values.conf.enable_paste }}
             - name: gnocchi-etc
               mountPath: /etc/gnocchi/api-paste.ini
               subPath: api-paste.ini
               readOnly: true
+            {{- end }}
             - name: gnocchi-etc
               mountPath: /etc/gnocchi/policy.json
               subPath: policy.json
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index 5756752c5..d0ae61d7f 100644
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@@ -375,6 +375,7 @@ conf:
     admin_keyring: null
     override:
     append:
+  enable_paste: True
   paste:
     pipeline:main:
       pipeline: gnocchi+auth
diff --git a/gnocchi/values_overrides/2023.2-ubuntu-jammy.yaml b/gnocchi/values_overrides/2023.2-ubuntu-jammy.yaml
new file mode 100644
index 000000000..ff4fe61a8
--- /dev/null
+++ b/gnocchi/values_overrides/2023.2-ubuntu-jammy.yaml
@@ -0,0 +1,37 @@
+---
+images:
+  tags:
+    db_init: quay.io/openstack.kolla/gnocchi-api:2023.2-ubuntu-jammy
+    db_sync: quay.io/openstack.kolla/gnocchi-api:2023.2-ubuntu-jammy
+    ks_user: docker.io/openstackhelm/heat:2023.2-ubuntu_jammy
+    ks_service: docker.io/openstackhelm/heat:2023.2-ubuntu_jammy
+    ks_endpoints: docker.io/openstackhelm/heat:2023.2-ubuntu_jammy
+    gnocchi_api: quay.io/openstack.kolla/gnocchi-api:2023.2-ubuntu-jammy
+    gnocchi_statsd: quay.io/openstack.kolla/gnocchi-statsd:2023.2-ubuntu-jammy
+    gnocchi_metricd: quay.io/openstack.kolla/gnocchi-metricd:2023.2-ubuntu-jammy
+    gnocchi_resources_cleaner: quay.io/openstack.kolla/gnocchi-base:2023.2-ubuntu-jammy
+conf:
+  apache: |
+    Listen 0.0.0.0:{{ tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+
+    SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
+    CustomLog /dev/stdout combined env=!forwarded
+    CustomLog /dev/stdout proxy env=forwarded
+
+    <VirtualHost *:{{ tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
+        WSGIDaemonProcess gnocchi processes=1 threads=2 user=gnocchi group=gnocchi display-name=%{GROUP}
+        WSGIProcessGroup gnocchi
+        WSGIScriptAlias / "/var/lib/kolla/venv/bin/gnocchi-api"
+        WSGIApplicationGroup %{GLOBAL}
+
+        ErrorLog /dev/stderr
+        SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
+        CustomLog /dev/stdout combined env=!forwarded
+        CustomLog /dev/stdout proxy env=forwarded
+
+        <Directory "/var/lib/kolla/venv/bin">
+              Require all granted
+        </Directory>
+    </VirtualHost>
+  enable_paste: False
+...
diff --git a/releasenotes/notes/gnocchi.yaml b/releasenotes/notes/gnocchi.yaml
index 02281660a..9a4a26e32 100644
--- a/releasenotes/notes/gnocchi.yaml
+++ b/releasenotes/notes/gnocchi.yaml
@@ -15,4 +15,5 @@ gnocchi:
   - 0.1.12 Update Ceph images to Jammy and Reef 18.2.1
   - 0.1.13 Bugfix Ceph user creation for RBD access
   - 0.1.14 Update Ceph images to patched 18.2.2 and restore debian-reef repo
+  - 0.1.15 Add 2023.2 Ubuntu Jammy overrides
 ...