Merge "Nova: Add policy.yaml to pods and correct values.yaml"

nova/templates/daemonset-compute.yaml

@@ -69,6 +69,10 @@ spec:
               mountPath: /etc/nova/api-paste.ini
               subPath: api-paste.ini
               readOnly: true
+            - name: nova-etc
+              mountPath: /etc/nova/policy.yaml
+              subPath: policy.yaml
+              readOnly: true
             - name: nova-etc
               mountPath: /etc/resolv.conf
               subPath: resolv.conf

nova/templates/deployment-api-metadata.yaml

@@ -95,6 +95,10 @@ spec:
               mountPath: /etc/nova/api-paste.ini
               subPath: api-paste.ini
               readOnly: true
+            - name: nova-etc
+              mountPath: /etc/nova/policy.yaml
+              subPath: policy.yaml
+              readOnly: true
 {{ if $mounts_nova_api_metadata.volumeMounts }}{{ toYaml $mounts_nova_api_metadata.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: nova-bin

nova/templates/deployment-api-osapi.yaml

@@ -83,6 +83,10 @@ spec:
               mountPath: /etc/nova/api-paste.ini
               subPath: api-paste.ini
               readOnly: true
+            - name: nova-etc
+              mountPath: /etc/nova/policy.yaml
+              subPath: policy.yaml
+              readOnly: true
 {{ if $mounts_nova_api_osapi.volumeMounts }}{{ toYaml $mounts_nova_api_osapi.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: nova-bin

nova/templates/deployment-conductor.yaml

@@ -66,6 +66,10 @@ spec:
               mountPath: /etc/nova/nova.conf
               subPath: nova.conf
               readOnly: true
+            - name: nova-etc
+              mountPath: /etc/nova/policy.yaml
+              subPath: policy.yaml
+              readOnly: true
 {{ if $mounts_nova_conductor.volumeMounts }}{{ toYaml $mounts_nova_conductor.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: nova-bin

nova/templates/deployment-consoleauth.yaml

@@ -67,6 +67,10 @@ spec:
               mountPath: /etc/nova/nova.conf
               subPath: nova.conf
               readOnly: true
+            - name: nova-etc
+              mountPath: /etc/nova/policy.yaml
+              subPath: policy.yaml
+              readOnly: true
 {{ if $mounts_nova_consoleauth.volumeMounts }}{{ toYaml $mounts_nova_consoleauth.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: nova-bin

nova/templates/deployment-scheduler.yaml

@@ -67,6 +67,10 @@ spec:
               mountPath: /etc/nova/nova.conf
               subPath: nova.conf
               readOnly: true
+            - name: nova-etc
+              mountPath: /etc/nova/policy.yaml
+              subPath: policy.yaml
+              readOnly: true
 {{ if $mounts_nova_scheduler.volumeMounts }}{{ toYaml $mounts_nova_scheduler.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: nova-bin

nova/values.yaml

@@ -273,7 +273,7 @@ conf:
     oslo_policy:
       oslo:
         policy:
-          policy_file: policy.yaml
+          policy_file: /etc/nova/policy.yaml
     oslo_concurrency:
       oslo:
         concurrency: