chore: Abandon 892704 patch
diff --git a/charts/heat/templates/configmap-etc.yaml b/charts/heat/templates/configmap-etc.yaml
index b6630e4..b49edcd 100644
--- a/charts/heat/templates/configmap-etc.yaml
+++ b/charts/heat/templates/configmap-etc.yaml
@@ -135,10 +135,6 @@
{{- $formatter_fluent := dict "class" "oslo_log.formatters.FluentFormatter" -}}
{{- $_ := set .Values.conf.logging "formatter_fluent" $formatter_fluent -}}
{{- end -}}
-
-{{- if not .Values.conf.paste }}
-{{- $_ := set $envAll.Values.conf.heat.paste_deploy "api_paste_config" "/var/lib/openstack/etc/heat/api-paste.ini" -}}
-{{- end }}
---
apiVersion: v1
kind: Secret
@@ -149,9 +145,7 @@
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
heat.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.heat | b64enc }}
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 }}
{{- if .Values.manifests.certificates }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.mpm_event "key" "mpm_event.conf" "format" "Secret" ) | indent 2 }}
diff --git a/charts/heat/templates/deployment-api.yaml b/charts/heat/templates/deployment-api.yaml
index 09407c0..0bed310 100644
--- a/charts/heat/templates/deployment-api.yaml
+++ b/charts/heat/templates/deployment-api.yaml
@@ -111,12 +111,10 @@
subPath: {{ base .Values.conf.heat.DEFAULT.log_config_append }}
readOnly: true
{{ end }}
- {{- if .Values.conf.paste }}
- name: heat-etc
mountPath: /etc/heat/api-paste.ini
subPath: api-paste.ini
readOnly: true
- {{- end }}
- name: heat-etc
mountPath: /etc/heat/policy.yaml
subPath: policy.yaml
diff --git a/charts/heat/templates/deployment-cfn.yaml b/charts/heat/templates/deployment-cfn.yaml
index ae9917d..94ddd06 100644
--- a/charts/heat/templates/deployment-cfn.yaml
+++ b/charts/heat/templates/deployment-cfn.yaml
@@ -111,12 +111,10 @@
subPath: {{ base .Values.conf.heat.DEFAULT.log_config_append }}
readOnly: true
{{ end }}
- {{- if .Values.conf.paste }}
- name: heat-etc
mountPath: /etc/heat/api-paste.ini
subPath: api-paste.ini
readOnly: true
- {{- end }}
- name: heat-etc
mountPath: /etc/heat/policy.yaml
subPath: policy.yaml
diff --git a/charts/heat/templates/deployment-cloudwatch.yaml b/charts/heat/templates/deployment-cloudwatch.yaml
index 2acff93..f1f7353 100644
--- a/charts/heat/templates/deployment-cloudwatch.yaml
+++ b/charts/heat/templates/deployment-cloudwatch.yaml
@@ -97,12 +97,10 @@
subPath: {{ base .Values.conf.heat.DEFAULT.log_config_append }}
readOnly: true
{{ end }}
- {{- if .Values.conf.paste }}
- name: heat-etc
mountPath: /etc/heat/api-paste.ini
subPath: api-paste.ini
readOnly: true
- {{- end }}
- name: heat-etc
mountPath: /etc/heat/policy.yaml
subPath: policy.yaml
diff --git a/charts/heat/values.yaml b/charts/heat/values.yaml
index 7cd5197..ce61e7d 100644
--- a/charts/heat/values.yaml
+++ b/charts/heat/values.yaml
@@ -280,7 +280,66 @@
type: OS::Heat::RandomString
properties:
length: 40
- paste: {}
+ paste:
+ pipeline:heat-api:
+ pipeline: cors request_id faultwrap http_proxy_to_wsgi versionnegotiation osprofiler authurl authtoken audit context apiv1app
+ pipeline:heat-api-standalone:
+ pipeline: cors request_id faultwrap http_proxy_to_wsgi versionnegotiation authurl authpassword context apiv1app
+ pipeline:heat-api-custombackend:
+ pipeline: cors request_id faultwrap versionnegotiation context custombackendauth apiv1app
+ pipeline:heat-api-cfn:
+ pipeline: cors http_proxy_to_wsgi cfnversionnegotiation osprofiler ec2authtoken authtoken audit context apicfnv1app
+ pipeline:heat-api-cfn-standalone:
+ pipeline: cors http_proxy_to_wsgi cfnversionnegotiation ec2authtoken context apicfnv1app
+ pipeline:heat-api-cloudwatch:
+ pipeline: cors versionnegotiation osprofiler ec2authtoken authtoken audit context apicwapp
+ pipeline:heat-api-cloudwatch-standalone:
+ pipeline: cors versionnegotiation ec2authtoken context apicwapp
+ app:apiv1app:
+ paste.app_factory: heat.common.wsgi:app_factory
+ heat.app_factory: heat.api.openstack.v1:API
+ app:apicfnv1app:
+ paste.app_factory: heat.common.wsgi:app_factory
+ heat.app_factory: heat.api.cfn.v1:API
+ app:apicwapp:
+ paste.app_factory: heat.common.wsgi:app_factory
+ heat.app_factory: heat.api.cloudwatch:API
+ filter:versionnegotiation:
+ paste.filter_factory: heat.common.wsgi:filter_factory
+ heat.filter_factory: heat.api.openstack:version_negotiation_filter
+ filter:cors:
+ paste.filter_factory: oslo_middleware.cors:filter_factory
+ oslo_config_project: heat
+ filter:faultwrap:
+ paste.filter_factory: heat.common.wsgi:filter_factory
+ heat.filter_factory: heat.api.openstack:faultwrap_filter
+ filter:cfnversionnegotiation:
+ paste.filter_factory: heat.common.wsgi:filter_factory
+ heat.filter_factory: heat.api.cfn:version_negotiation_filter
+ filter:cwversionnegotiation:
+ paste.filter_factory: heat.common.wsgi:filter_factory
+ heat.filter_factory: heat.api.cloudwatch:version_negotiation_filter
+ filter:context:
+ paste.filter_factory: heat.common.context:ContextMiddleware_filter_factory
+ filter:ec2authtoken:
+ paste.filter_factory: heat.api.aws.ec2token:EC2Token_filter_factory
+ filter:http_proxy_to_wsgi:
+ paste.filter_factory: oslo_middleware:HTTPProxyToWSGI.factory
+ filter:authurl:
+ paste.filter_factory: heat.common.auth_url:filter_factory
+ filter:authtoken:
+ paste.filter_factory: keystonemiddleware.auth_token:filter_factory
+ filter:authpassword:
+ paste.filter_factory: heat.common.auth_password:filter_factory
+ filter:custombackendauth:
+ paste.filter_factory: heat.common.custom_backend_auth:filter_factory
+ filter:audit:
+ paste.filter_factory: keystonemiddleware.audit:filter_factory
+ audit_map_file: /etc/heat/api_audit_map.conf
+ filter:request_id:
+ paste.filter_factory: oslo_middleware.request_id:RequestId.factory
+ filter:osprofiler:
+ paste.filter_factory: osprofiler.web:WsgiMiddleware.factory
policy: {}
heat:
DEFAULT: