From 82ed9d6d5617826e047be4546cb56e5c8d0cac0e Mon Sep 17 00:00:00 2001
From: "Christian M. Adams" <rooftopcellist@gmail.com>
Date: Mon, 17 May 2021 16:38:57 -0400
Subject: [PATCH] Default to storage class being undefined   * This is so that
 users can intentially set it to an empty string if they want to use the
 default storage class   * conversely, now users can manually create a pvc
 that does not utilize the default storage class

---
 roles/backup/defaults/main.yml                     | 3 ---
 roles/backup/templates/backup_pvc.yml.j2           | 2 +-
 roles/installer/defaults/main.yml                  | 1 -
 roles/installer/templates/tower_persistent.yaml.j2 | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/roles/backup/defaults/main.yml b/roles/backup/defaults/main.yml
index b160118f..3ad4c53a 100644
--- a/roles/backup/defaults/main.yml
+++ b/roles/backup/defaults/main.yml
@@ -10,6 +10,3 @@ backup_pvc_namespace: "{{ meta.namespace }}"
 
 # Size of backup PVC if created dynamically
 backup_storage_requirements: ''
-
-# Specify storage class to determine how to dynamically create PVC's with
-backup_storage_class: ''
diff --git a/roles/backup/templates/backup_pvc.yml.j2 b/roles/backup/templates/backup_pvc.yml.j2
index d024a565..67ea439a 100644
--- a/roles/backup/templates/backup_pvc.yml.j2
+++ b/roles/backup/templates/backup_pvc.yml.j2
@@ -7,7 +7,7 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-{% if backup_storage_class != '' %}
+{% if backup_storage_class is defined %}
   storageClassName: {{ backup_storage_class }}
 {% endif %}
   resources:
diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml
index bd40af4e..58bc8fdb 100644
--- a/roles/installer/defaults/main.yml
+++ b/roles/installer/defaults/main.yml
@@ -178,7 +178,6 @@ tower_projects_existing_claim: ''
 #
 # Define the storage_class, size and access_mode
 # when not using an existing claim
-tower_projects_storage_class: ''
 tower_projects_storage_size: 8Gi
 tower_projects_storage_access_mode: ReadWriteMany
 
diff --git a/roles/installer/templates/tower_persistent.yaml.j2 b/roles/installer/templates/tower_persistent.yaml.j2
index 8240f011..002a9347 100644
--- a/roles/installer/templates/tower_persistent.yaml.j2
+++ b/roles/installer/templates/tower_persistent.yaml.j2
@@ -16,7 +16,7 @@ spec:
   resources:
     requests:
       storage: {{ tower_projects_storage_size }}
-{% if tower_projects_storage_class != '' %}
+{% if tower_projects_storage_class is defined %}
   storageClassName: {{ tower_projects_storage_class }}
 {% endif %}
 {% endif %}