Merge "Remove keystone paste ini file"
This commit is contained in:
commit
109dc62341
@ -14,7 +14,7 @@ apiVersion: v1
|
|||||||
appVersion: v1.0.0
|
appVersion: v1.0.0
|
||||||
description: OpenStack-Helm Keystone
|
description: OpenStack-Helm Keystone
|
||||||
name: keystone
|
name: keystone
|
||||||
version: 0.2.0
|
version: 0.2.1
|
||||||
home: https://docs.openstack.org/keystone/latest/
|
home: https://docs.openstack.org/keystone/latest/
|
||||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
|
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -54,7 +54,6 @@ data:
|
|||||||
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
|
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
|
||||||
keystone.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.keystone | b64enc }}
|
keystone.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.keystone | b64enc }}
|
||||||
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.logging | b64enc }}
|
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.logging | b64enc }}
|
||||||
keystone-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
|
|
||||||
policy.json: {{ toJson .Values.conf.policy | b64enc }}
|
policy.json: {{ toJson .Values.conf.policy | b64enc }}
|
||||||
access_rules.json: {{ toJson .Values.conf.access_rules | b64enc }}
|
access_rules.json: {{ toJson .Values.conf.access_rules | b64enc }}
|
||||||
ports.conf: ''
|
ports.conf: ''
|
||||||
|
@ -105,10 +105,6 @@ spec:
|
|||||||
subPath: {{ base .Values.conf.keystone.DEFAULT.log_config_append }}
|
subPath: {{ base .Values.conf.keystone.DEFAULT.log_config_append }}
|
||||||
readOnly: true
|
readOnly: true
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: keystone-etc
|
|
||||||
mountPath: /etc/keystone/keystone-paste.ini
|
|
||||||
subPath: keystone-paste.ini
|
|
||||||
readOnly: true
|
|
||||||
- name: keystone-etc
|
- name: keystone-etc
|
||||||
mountPath: /etc/keystone/policy.json
|
mountPath: /etc/keystone/policy.json
|
||||||
subPath: policy.json
|
subPath: policy.json
|
||||||
|
@ -561,58 +561,6 @@ conf:
|
|||||||
# A sample of the value override can be found in sample file:
|
# A sample of the value override can be found in sample file:
|
||||||
# tools/overrides/example/keystone_domain_config.yaml
|
# tools/overrides/example/keystone_domain_config.yaml
|
||||||
# ks_domains:
|
# ks_domains:
|
||||||
paste:
|
|
||||||
filter:debug:
|
|
||||||
use: egg:oslo.middleware#debug
|
|
||||||
filter:request_id:
|
|
||||||
use: egg:oslo.middleware#request_id
|
|
||||||
filter:build_auth_context:
|
|
||||||
use: egg:keystone#build_auth_context
|
|
||||||
filter:token_auth:
|
|
||||||
use: egg:keystone#token_auth
|
|
||||||
filter:json_body:
|
|
||||||
use: egg:keystone#json_body
|
|
||||||
filter:cors:
|
|
||||||
use: egg:oslo.middleware#cors
|
|
||||||
oslo_config_project: keystone
|
|
||||||
filter:http_proxy_to_wsgi:
|
|
||||||
use: egg:oslo.middleware#http_proxy_to_wsgi
|
|
||||||
filter:ec2_extension:
|
|
||||||
use: egg:keystone#ec2_extension
|
|
||||||
filter:ec2_extension_v3:
|
|
||||||
use: egg:keystone#ec2_extension_v3
|
|
||||||
filter:s3_extension:
|
|
||||||
use: egg:keystone#s3_extension
|
|
||||||
filter:url_normalize:
|
|
||||||
use: egg:keystone#url_normalize
|
|
||||||
filter:sizelimit:
|
|
||||||
use: egg:oslo.middleware#sizelimit
|
|
||||||
filter:osprofiler:
|
|
||||||
use: egg:osprofiler#osprofiler
|
|
||||||
app:public_service:
|
|
||||||
use: egg:keystone#public_service
|
|
||||||
app:service_v3:
|
|
||||||
use: egg:keystone#service_v3
|
|
||||||
app:admin_service:
|
|
||||||
use: egg:keystone#admin_service
|
|
||||||
pipeline:api_v3:
|
|
||||||
pipeline: cors sizelimit http_proxy_to_wsgi osprofiler url_normalize request_id build_auth_context token_auth json_body ec2_extension_v3 s3_extension service_v3
|
|
||||||
app:public_version_service:
|
|
||||||
use: egg:keystone#public_version_service
|
|
||||||
app:admin_version_service:
|
|
||||||
use: egg:keystone#admin_version_service
|
|
||||||
pipeline:public_version_api:
|
|
||||||
pipeline: cors sizelimit osprofiler url_normalize public_version_service
|
|
||||||
pipeline:admin_version_api:
|
|
||||||
pipeline: cors sizelimit osprofiler url_normalize admin_version_service
|
|
||||||
composite:main:
|
|
||||||
use: egg:Paste#urlmap
|
|
||||||
/v3: api_v3
|
|
||||||
/: public_version_api
|
|
||||||
composite:admin:
|
|
||||||
use: egg:Paste#urlmap
|
|
||||||
/v3: api_v3
|
|
||||||
/: admin_version_api
|
|
||||||
policy:
|
policy:
|
||||||
admin_required: role:admin or is_admin:1
|
admin_required: role:admin or is_admin:1
|
||||||
service_role: role:service
|
service_role: role:service
|
||||||
|
@ -16,4 +16,5 @@ keystone:
|
|||||||
- 0.1.13 Fix Error - wrong number of args for set
|
- 0.1.13 Fix Error - wrong number of args for set
|
||||||
- 0.1.14 Remove setup helm hooks
|
- 0.1.14 Remove setup helm hooks
|
||||||
- 0.2.0 Remove support for releases before T
|
- 0.2.0 Remove support for releases before T
|
||||||
|
- 0.2.1 Remove paste ini config settings
|
||||||
...
|
...
|
||||||
|
Loading…
x
Reference in New Issue
Block a user