chore: Abandon 892704 patch
diff --git a/charts/manila/templates/configmap-etc.yaml b/charts/manila/templates/configmap-etc.yaml
index 15f7fde..e230aa4 100644
--- a/charts/manila/templates/configmap-etc.yaml
+++ b/charts/manila/templates/configmap-etc.yaml
@@ -59,10 +59,6 @@
{{- $_ := set .Values.conf.manila.keystone_authtoken "memcache_secret_key" $memcache_secret_key -}}
{{- end -}}
-{{- if not .Values.conf.paste }}
-{{- $_ := set $envAll.Values.conf.manila.DEFAULT "api_paste_config" "/var/lib/openstack/etc/manila/api-paste.ini" -}}
-{{- end }}
-
{{- if empty .Values.conf.manila.database.connection -}}
{{- $_ := tuple "oslo_db" "internal" "manila" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.manila.database "connection" -}}
{{- end -}}
@@ -237,9 +233,7 @@
{{ printf "%s.filters" $filePrefix }}: {{ $value.content | b64enc }}
{{- end }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
- {{- if .Values.conf.paste }}
api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
- {{- end }}
policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
manila_sudoers: {{ $envAll.Values.conf.manila_sudoers | b64enc }}
rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }}
diff --git a/charts/manila/templates/deployment-api.yaml b/charts/manila/templates/deployment-api.yaml
index b2169f3..0e4505a 100644
--- a/charts/manila/templates/deployment-api.yaml
+++ b/charts/manila/templates/deployment-api.yaml
@@ -100,12 +100,10 @@
subPath: {{ base .Values.conf.manila.DEFAULT.log_config_append }}
readOnly: true
{{- end }}
- {{- if .Values.conf.paste }}
- name: manila-etc
mountPath: /etc/manila/api-paste.ini
subPath: api-paste.ini
readOnly: true
- {{- end }}
- name: manila-etc
mountPath: /etc/manila/policy.yaml
subPath: policy.yaml
diff --git a/charts/manila/values.yaml b/charts/manila/values.yaml
index 2132de2..76e19d3 100644
--- a/charts/manila/values.yaml
+++ b/charts/manila/values.yaml
@@ -405,7 +405,55 @@
service: oslo_messaging
conf:
- paste: {}
+ paste:
+ composite:osapi_share:
+ use: call:manila.api:root_app_factory
+ /: apiversions
+ /healthcheck: healthcheck
+ /v1: openstack_share_api
+ /v2: openstack_share_api_v2
+ composite:openstack_share_api:
+ use: call:manila.api.middleware.auth:pipeline_factory
+ noauth: cors faultwrap http_proxy_to_wsgi sizelimit osprofiler noauth api
+ keystone: cors faultwrap http_proxy_to_wsgi sizelimit osprofiler authtoken keystonecontext api
+ keystone_nolimit: cors faultwrap http_proxy_to_wsgi sizelimit osprofiler authtoken keystonecontext api
+ composite:openstack_share_api_v2:
+ use: call:manila.api.middleware.auth:pipeline_factory
+ noauth: cors faultwrap http_proxy_to_wsgi sizelimit osprofiler noauth apiv2
+ noauthv2: cors faultwrap http_proxy_to_wsgi sizelimit osprofiler noauthv2 apiv2
+ keystone: cors faultwrap http_proxy_to_wsgi sizelimit osprofiler authtoken keystonecontext apiv2
+ keystone_nolimit: cors faultwrap http_proxy_to_wsgi sizelimit osprofiler authtoken keystonecontext apiv2
+ filter:faultwrap:
+ paste.filter_factory: manila.api.middleware.fault:FaultWrapper.factory
+ filter:noauth:
+ paste.filter_factory: manila.api.middleware.auth:NoAuthMiddleware.factory
+ filter:noauthv2:
+ paste.filter_factory: manila.api.middleware.auth:NoAuthMiddlewarev2_60.factory
+ filter:sizelimit:
+ paste.filter_factory: oslo_middleware.sizelimit:RequestBodySizeLimiter.factory
+ filter:osprofiler:
+ paste.filter_factory: osprofiler.web:WsgiMiddleware.factory
+ filter:http_proxy_to_wsgi:
+ paste.filter_factory: oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory
+ app:api:
+ paste.app_factory: manila.api.v1.router:APIRouter.factory
+ app:apiv2:
+ paste.app_factory: manila.api.v2.router:APIRouter.factory
+ pipeline:apiversions:
+ pipeline: cors faultwrap http_proxy_to_wsgi osshareversionapp
+ app:osshareversionapp:
+ paste.app_factory: manila.api.versions:VersionsRouter.factory
+ filter:keystonecontext:
+ paste.filter_factory: manila.api.middleware.auth:ManilaKeystoneContext.factory
+ filter:authtoken:
+ paste.filter_factory: keystonemiddleware.auth_token:filter_factory
+ filter:cors:
+ paste.filter_factory: oslo_middleware.cors:filter_factory
+ oslo_config_project: manila
+ app:healthcheck:
+ paste.app_factory: oslo_middleware:Healthcheck.app_factory
+ backends: disable_by_file
+ disable_by_file_path: /etc/manila/healthcheck_disable
policy: {}
manila_sudoers: |
# This sudoers file supports rootwrap for both Kolla and LOCI Images.