Make the name of image properties case-insensitive

Defining EXCLUDE_TASK_DeleteSSHKeys is the same as defining
EXCLUDE_TASK_DELETESSHKEYS

diff --git a/snf-image-helper/common.sh b/snf-image-helper/common.sh
index 40f9c91..3d7347d 100644 (file)
--- a/snf-image-helper/common.sh
+++ b/snf-image-helper/common.sh
@@ -412,8 +412,8 @@ task_cleanup() {
 }
 
 check_if_excluded() {
-
-    local exclude=SNF_IMAGE_PROPERTY_EXCLUDE_TASK_${PROGNAME:2}
+    local name="$(tr [a-z] [A-Z] <<< ${PROGNAME:2})"
+    local exclude="SNF_IMAGE_PROPERTY_EXCLUDE_TASK_${name}"
     if [ -n "${!exclude}" ]; then
         warn "Task $PROGNAME was excluded and will not run."
         exit 0

diff --git a/snf-image-helper/decode-properties.py b/snf-image-helper/decode-properties.py
index 9976884..869973e 100755 (executable)
--- a/snf-image-helper/decode-properties.py
+++ b/snf-image-helper/decode-properties.py
@@ -61,7 +61,7 @@ def main():
 
     properties = json.load(infh)
     for key, value in properties.items():
-        os.environ['SNF_IMAGE_PROPERTY_' + key] = value
+        os.environ['SNF_IMAGE_PROPERTY_' + str(key).upper()] = value
 
     p = subprocess.Popen(['bash', '-c', 'set'], stdout=subprocess.PIPE)
     output = StringIO(p.communicate()[0]);