From c5100307a6048e55790cff158b38443d6e93c8dd Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Sun, 18 Jun 2017 21:57:36 -0500
Subject: [PATCH] Nova: Add policy.yaml to pods and correct values.yaml

The policy.yaml was not mounted into pods in Nova, or its location
specified correctly in the default values, this PS resolves that.

Change-Id: Ie4d1b8414f626ac4b5fdc232644d5e8a3a99d8bb
---
 nova/templates/daemonset-compute.yaml       | 4 ++++
 nova/templates/deployment-api-metadata.yaml | 4 ++++
 nova/templates/deployment-api-osapi.yaml    | 4 ++++
 nova/templates/deployment-conductor.yaml    | 4 ++++
 nova/templates/deployment-consoleauth.yaml  | 4 ++++
 nova/templates/deployment-scheduler.yaml    | 4 ++++
 nova/values.yaml                            | 2 +-
 7 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index 6c188fd9e2..a6f82fea62 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/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
diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml
index 6b67a87052..ab80909eca 100644
--- a/nova/templates/deployment-api-metadata.yaml
+++ b/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
diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml
index a882fc652b..b75741809c 100644
--- a/nova/templates/deployment-api-osapi.yaml
+++ b/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
diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml
index 136ddf859c..e46ba2fa2f 100644
--- a/nova/templates/deployment-conductor.yaml
+++ b/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
diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml
index 5ab297404e..73548f6ea8 100644
--- a/nova/templates/deployment-consoleauth.yaml
+++ b/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
diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
index a9467d5bf1..4d01adf898 100644
--- a/nova/templates/deployment-scheduler.yaml
+++ b/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
diff --git a/nova/values.yaml b/nova/values.yaml
index 8c407a14a2..d5dd214dfc 100644
--- a/nova/values.yaml
+++ b/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: