Merge "Modify incorrect format of Cinder policy file"

cinder/templates/configmap-etc.yaml

@@ -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 }}

cinder/templates/deployment-api.yaml

@@ -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

cinder/templates/deployment-scheduler.yaml

@@ -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

cinder/values.yaml

@@ -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: