From f0f6d7f5fab5271fbfdf70488d5128968a301db2 Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Wed, 4 Apr 2018 11:46:05 -0400
Subject: [PATCH] Ceph: Update armada manifests to remove jobs on upgrade
 correctly

This PS updates the ceph chart to remove keyring management jobs
for namespaces.

Change-Id: Id0be7dcc6fd1c6b28a3a0514dc0442a41d5c5b9d
---
 tools/deployment/armada/multinode/armada-lma.yaml | 10 ++++++++++
 tools/deployment/armada/multinode/armada-osh.yaml |  6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/tools/deployment/armada/multinode/armada-lma.yaml b/tools/deployment/armada/multinode/armada-lma.yaml
index ca5c945e8e..2cefc3afd3 100644
--- a/tools/deployment/armada/multinode/armada-lma.yaml
+++ b/tools/deployment/armada/multinode/armada-lma.yaml
@@ -75,6 +75,16 @@ data:
     no_hooks: false
   upgrade:
     no_hooks: false
+    pre:
+      delete:
+        - type: job
+          labels:
+            application: ceph
+            component: client-key-generator
+        - type: job
+          labels:
+            application: ceph
+            component: client-key-cleaner
   values:
     endpoints:
       identity:
diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml
index 5660ae575a..7d131befa9 100644
--- a/tools/deployment/armada/multinode/armada-osh.yaml
+++ b/tools/deployment/armada/multinode/armada-osh.yaml
@@ -84,7 +84,11 @@ data:
         - type: job
           labels:
             application: ceph
-            component: namespace-client-key-generator
+            component: client-key-generator
+        - type: job
+          labels:
+            application: ceph
+            component: client-key-cleaner
   values:
     labels:
       jobs: