Add 2023.2 Ubuntu Jammy overrides

Change-Id: Ia23370d07faf1f8a1e05447459ce9872e8d4e875
This commit is contained in:
dengzhaosen 2024-03-26 15:52:51 +08:00
parent a957d8e12c
commit aa0a5c9c3d
5 changed files with 42 additions and 1 deletions

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v3.0.3 appVersion: v3.0.3
description: OpenStack-Helm Gnocchi description: OpenStack-Helm Gnocchi
name: gnocchi name: gnocchi
version: 0.1.14 version: 0.1.15
home: https://gnocchi.xyz/ home: https://gnocchi.xyz/
icon: https://gnocchi.xyz/_static/gnocchi-logo.png icon: https://gnocchi.xyz/_static/gnocchi-logo.png
sources: sources:

View File

@ -98,10 +98,12 @@ spec:
mountPath: /etc/gnocchi/gnocchi.conf mountPath: /etc/gnocchi/gnocchi.conf
subPath: gnocchi.conf subPath: gnocchi.conf
readOnly: true readOnly: true
{{- if .Values.conf.enable_paste }}
- name: gnocchi-etc - name: gnocchi-etc
mountPath: /etc/gnocchi/api-paste.ini mountPath: /etc/gnocchi/api-paste.ini
subPath: api-paste.ini subPath: api-paste.ini
readOnly: true readOnly: true
{{- end }}
- name: gnocchi-etc - name: gnocchi-etc
mountPath: /etc/gnocchi/policy.json mountPath: /etc/gnocchi/policy.json
subPath: policy.json subPath: policy.json

View File

@ -375,6 +375,7 @@ conf:
admin_keyring: null admin_keyring: null
override: override:
append: append:
enable_paste: True
paste: paste:
pipeline:main: pipeline:main:
pipeline: gnocchi+auth pipeline: gnocchi+auth

View File

@ -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
...

View File

@ -15,4 +15,5 @@ gnocchi:
- 0.1.12 Update Ceph images to Jammy and Reef 18.2.1 - 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.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.14 Update Ceph images to patched 18.2.2 and restore debian-reef repo
- 0.1.15 Add 2023.2 Ubuntu Jammy overrides
... ...