From ef62e93608273ecc69091255657594fad714a95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulko?= <michal.dulko@intel.com>
Date: Mon, 3 Jul 2017 13:42:01 +0200
Subject: [PATCH] Remove /var/cache/cinder emptyDir volume

This patch removes unused `/var/cache/cinder` volume that is mounted for
each of Cinder services. I suppose it was added to serve as value of
`signing_dir` option from keystonemiddleware and is used to cache PKI
tokens. We're however never setting the option to that value and the
option was deprecated in Ocata, so we should be fine to remove it.

In case someone still wanted to use `signing_dir` config option, he can
easily confiure it back using config and volumes overrides.

Related-Bug: 1702072

Change-Id: I03460151e01293b19a864528561c80cab1a72114
---
 cinder/templates/deployment-api.yaml       | 4 ----
 cinder/templates/deployment-backup.yaml    | 4 ----
 cinder/templates/deployment-scheduler.yaml | 4 ----
 cinder/templates/deployment-volume.yaml    | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml
index 0f5525c02e..8bd784223b 100644
--- a/cinder/templates/deployment-api.yaml
+++ b/cinder/templates/deployment-api.yaml
@@ -74,8 +74,6 @@ spec:
             tcpSocket:
               port: {{ .Values.conf.cinder.default.cinder.osapi_volume_listen_port }}
           volumeMounts:
-            - name: pod-var-cache-cinder
-              mountPath: /var/cache/cinder
             - name: cinder-bin
               mountPath: /tmp/cinder-api.sh
               subPath: cinder-api.sh
@@ -94,8 +92,6 @@ spec:
               readOnly: true
 {{ if $mounts_cinder_api.volumeMounts }}{{ toYaml $mounts_cinder_api.volumeMounts | indent 12 }}{{ end }}
       volumes:
-        - name: pod-var-cache-cinder
-          emptyDir: {}
         - name: cinder-bin
           configMap:
             name: cinder-bin
diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml
index fb62824a42..8ca1178f2c 100644
--- a/cinder/templates/deployment-backup.yaml
+++ b/cinder/templates/deployment-backup.yaml
@@ -77,8 +77,6 @@ spec:
           command:
             - /tmp/cinder-backup.sh
           volumeMounts:
-            - name: pod-var-cache-cinder
-              mountPath: /var/cache/cinder
             - name: cinder-bin
               mountPath: /tmp/cinder-backup.sh
               subPath: cinder-backup.sh
@@ -101,8 +99,6 @@ spec:
             {{- end -}}
 {{ if $mounts_cinder_backup.volumeMounts }}{{ toYaml $mounts_cinder_backup.volumeMounts | indent 12 }}{{ end }}
       volumes:
-        - name: pod-var-cache-cinder
-          emptyDir: {}
         - name: cinder-etc
           configMap:
             name: cinder-etc
diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml
index db21734d8c..dd98365e16 100644
--- a/cinder/templates/deployment-scheduler.yaml
+++ b/cinder/templates/deployment-scheduler.yaml
@@ -60,8 +60,6 @@ spec:
           command:
             - /tmp/cinder-scheduler.sh
           volumeMounts:
-            - name: pod-var-cache-cinder
-              mountPath: /var/cache/cinder
             - name: cinder-bin
               mountPath: /tmp/cinder-scheduler.sh
               subPath: cinder-scheduler.sh
@@ -80,8 +78,6 @@ spec:
               readOnly: true
 {{ if $mounts_cinder_scheduler.volumeMounts }}{{ toYaml $mounts_cinder_scheduler.volumeMounts | indent 12 }}{{ end }}
       volumes:
-        - name: pod-var-cache-cinder
-          emptyDir: {}
         - name: cinder-bin
           configMap:
             name: cinder-bin
diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml
index a35bbff589..0376fa9c07 100644
--- a/cinder/templates/deployment-volume.yaml
+++ b/cinder/templates/deployment-volume.yaml
@@ -77,8 +77,6 @@ spec:
           command:
             - /tmp/cinder-volume.sh
           volumeMounts:
-            - name: pod-var-cache-cinder
-              mountPath: /var/cache/cinder
             - name: cinder-bin
               mountPath: /tmp/cinder-volume.sh
               subPath: cinder-volume.sh
@@ -105,8 +103,6 @@ spec:
             {{- end }}
 {{ if $mounts_cinder_volume.volumeMounts }}{{ toYaml $mounts_cinder_volume.volumeMounts | indent 12 }}{{ end }}
       volumes:
-        - name: pod-var-cache-cinder
-          emptyDir: {}
         - name: cinder-bin
           configMap:
             name: cinder-bin