From 41073fff0270aa624fb569295530386c9391a88b Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler.smith@windriver.com>
Date: Wed, 28 Nov 2018 19:58:33 -0500
Subject: [PATCH] Cleaning up after application removal

This commit adds commands that run after the armada
removal to delete the pvs that are linked to pvcs from
the openstack namespace and then deletes the namespace.

The ceph-etc configmap was also added to the rdb-provisioner
chart to remove the manual workaround.

Change-Id: I546cebee549bc3ef81693692579596d2d72ebf95
Story: 2003908
Task: 28130
Signed-off-by: Tyler Smith <tyler.smith@windriver.com>
---
 .../templates/pre-install-check-ceph.yaml      | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/pre-install-check-ceph.yaml b/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/pre-install-check-ceph.yaml
index 32f2512..8bd386e 100644
--- a/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/pre-install-check-ceph.yaml
+++ b/stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/pre-install-check-ceph.yaml
@@ -178,4 +178,20 @@ spec:
             - name: config-volume-{{- $root.Values.global.name }}
               mountPath: {{ $mount }}
         {{- end }}
-{{- end }}
\ No newline at end of file
+---
+# This ConfigMap is needed because we're not using ceph's helm chart
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ceph-etc
+  # This is the name of the openstack application's namespace
+  namespace: openstack
+data:
+  ceph.conf: |
+    [global]
+    auth_supported = none
+    {{ $monitors := $defaults.monitors }}{{ range $index, $element := $monitors}}
+    [mon.{{- $index }}]
+    mon_addr = {{ $element }}
+    {{- end }}
+{{- end }}