openstack/openstack-helm
Code Issues Proposed changes

Merge "Modify incorrect format of Cinder policy file"

Browse Source
This commit is contained in:
Zuul 2020-02-19 16:44:08 +00:00 committed by Gerrit Code Review
commit ff95038bae
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/templates/configmap-etc.yaml
View File

@ -115,7 +115,7 @@ data:
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} 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 }} 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 }} 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 }} 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 }} cinder_sudoers: {{ $envAll.Values.conf.cinder_sudoers | b64enc }}
rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }} rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }}

4
cinder/templates/deployment-api.yaml
View File

@ -120,8 +120,8 @@ spec:
subPath: api-paste.ini subPath: api-paste.ini
readOnly: true readOnly: true
- name: cinder-etc - name: cinder-etc
mountPath: /etc/cinder/policy.json mountPath: /etc/cinder/policy.yaml
subPath: policy.json subPath: policy.yaml
readOnly: true readOnly: true
- name: cinder-etc - name: cinder-etc
mountPath: /etc/cinder/api_audit_map.conf mountPath: /etc/cinder/api_audit_map.conf

4
cinder/templates/deployment-scheduler.yaml
View File

@ -98,8 +98,8 @@ spec:
subPath: api-paste.ini subPath: api-paste.ini
readOnly: true readOnly: true
- name: cinder-etc - name: cinder-etc
mountPath: /etc/cinder/policy.json mountPath: /etc/cinder/policy.yaml
subPath: policy.json subPath: policy.yaml
readOnly: true readOnly: true
{{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }} {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
- name: cinder-coordination - name: cinder-coordination

2
cinder/values.yaml
View File

@ -856,6 +856,8 @@ conf:
keystone_authtoken: keystone_authtoken:
auth_version: v3 auth_version: v3
auth_type: password auth_type: password
oslo_policy:
policy_file: /etc/cinder/policy.yaml
oslo_concurrency: oslo_concurrency:
lock_path: "/var/lib/cinder/tmp" lock_path: "/var/lib/cinder/tmp"
oslo_messaging_notifications: oslo_messaging_notifications: