Modify incorrect format of Cinder policy file
Cinder default format of policy file is changed from "json" to "yaml" in stein. This patch set modifies Cinder chart templates to load policies in yaml format. Change-Id: I28f3d5be6609cd28bbc1ce8e5fc1d1cf4730b760
This commit is contained in:
parent
90d070390d
commit
8401db0e77
@ -115,7 +115,7 @@ data:
|
||||
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
|
||||
backends.conf: {{ include "helm-toolkit.utils.to_ini" .Values.conf.backends | b64enc }}
|
||||
api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
|
||||
policy.json: {{ toJson .Values.conf.policy | b64enc }}
|
||||
policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
|
||||
api_audit_map.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.api_audit_map | b64enc }}
|
||||
cinder_sudoers: {{ $envAll.Values.conf.cinder_sudoers | b64enc }}
|
||||
rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }}
|
||||
|
@ -120,8 +120,8 @@ spec:
|
||||
subPath: api-paste.ini
|
||||
readOnly: true
|
||||
- name: cinder-etc
|
||||
mountPath: /etc/cinder/policy.json
|
||||
subPath: policy.json
|
||||
mountPath: /etc/cinder/policy.yaml
|
||||
subPath: policy.yaml
|
||||
readOnly: true
|
||||
- name: cinder-etc
|
||||
mountPath: /etc/cinder/api_audit_map.conf
|
||||
|
@ -98,8 +98,8 @@ spec:
|
||||
subPath: api-paste.ini
|
||||
readOnly: true
|
||||
- name: cinder-etc
|
||||
mountPath: /etc/cinder/policy.json
|
||||
subPath: policy.json
|
||||
mountPath: /etc/cinder/policy.yaml
|
||||
subPath: policy.yaml
|
||||
readOnly: true
|
||||
{{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
|
||||
- name: cinder-coordination
|
||||
|
@ -856,6 +856,8 @@ conf:
|
||||
keystone_authtoken:
|
||||
auth_version: v3
|
||||
auth_type: password
|
||||
oslo_policy:
|
||||
policy_file: /etc/cinder/policy.yaml
|
||||
oslo_concurrency:
|
||||
lock_path: "/var/lib/cinder/tmp"
|
||||
oslo_messaging_notifications:
|
||||
|
Loading…
Reference in New Issue
Block a user