From fcb654512a324da58c3cd1ba406f56730138feae Mon Sep 17 00:00:00 2001
From: Luke Repko <luke.repko@rackspace.com>
Date: Tue, 5 Mar 2024 19:02:08 -0600
Subject: [PATCH] fix: update system api-paste.ini app defaults

These may need further customization depending on the environment
gnocchi will be run. Aside from the pipeline:main section, this is the
default configuration in the latest version of gnocchi.
---
 .../gnocchi/gnocchi-helm-overrides.yaml       | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/helm-configs/gnocchi/gnocchi-helm-overrides.yaml b/helm-configs/gnocchi/gnocchi-helm-overrides.yaml
index 59821714..7ade5b93 100644
--- a/helm-configs/gnocchi/gnocchi-helm-overrides.yaml
+++ b/helm-configs/gnocchi/gnocchi-helm-overrides.yaml
@@ -376,29 +376,41 @@ conf:
     override:
     append:
   paste:
-    pipeline:main:
-      pipeline: gnocchi+auth
-    composite:gnocchi+noauth:
+    app:gnocchiv1:
+      paste.app_factory: gnocchi.rest.app:app_factory
+      root: gnocchi.rest.api.V1Controller
+    app:gnocchiversions:
+      paste.app_factory: gnocchi.rest.app:app_factory
+      root: gnocchi.rest.api.VersionsController
+    app:healthcheck:
+      oslo_config_project: gnocchi
+      use: egg:oslo.middleware#healthcheck
+    composite:gnocchi+basic:
+      /: gnocchiversions_pipeline
+      /healthcheck: healthcheck
+      /v1: gnocchiv1+noauth
+      use: egg:Paste#urlmap
+    composite:gnocchi+keystone:
+      /: gnocchiversions_pipeline
+      /healthcheck: healthcheck
+      /v1: gnocchiv1+keystone
       use: egg:Paste#urlmap
-      /: gnocchiversions
+    composite:gnocchi+remoteuser:
+      /: gnocchiversions_pipeline
+      /healthcheck: healthcheck
       /v1: gnocchiv1+noauth
-    composite:gnocchi+auth:
       use: egg:Paste#urlmap
-      /: gnocchiversions
-      /v1: gnocchiv1+auth
-    pipeline:gnocchiv1+noauth:
-      pipeline: gnocchiv1
-    pipeline:gnocchiv1+auth:
-      pipeline: keystone_authtoken gnocchiv1
-    app:gnocchiversions:
-      paste.app_factory: gnocchi.rest.app:app_factory
-      root: gnocchi.rest.VersionsController
-    app:gnocchiv1:
-      paste.app_factory: gnocchi.rest.app:app_factory
-      root: gnocchi.rest.V1Controller
     filter:keystone_authtoken:
-      paste.filter_factory: keystonemiddleware.auth_token:filter_factory
       oslo_config_project: gnocchi
+      use: egg:keystonemiddleware#auth_token
+    pipeline:gnocchiv1+keystone:
+      pipeline: keystone_authtoken gnocchiv1
+    pipeline:gnocchiv1+noauth:
+      pipeline: gnocchiv1
+    pipeline:gnocchiversions_pipeline:
+      pipeline: gnocchiversions
+    pipeline:main:
+      pipeline: gnocchi+keystone
   policy:
     admin_or_creator: 'role:admin or project_id:%(created_by_project_id)s'
     resource_owner: 'project_id:%(project_id)s'