From 3d484dd5e5ac4a8ba0c4b50baba79d6d7e5bba7e Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Tue, 21 Mar 2017 15:53:01 -0400 Subject: Adding error checking to the delete. --- roles/lib_openshift/library/oc_configmap.py | 4 ++++ roles/lib_openshift/src/class/oc_configmap.py | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'roles') diff --git a/roles/lib_openshift/library/oc_configmap.py b/roles/lib_openshift/library/oc_configmap.py index 0b6f1adf8..90d38c7a9 100644 --- a/roles/lib_openshift/library/oc_configmap.py +++ b/roles/lib_openshift/library/oc_configmap.py @@ -1492,6 +1492,10 @@ class OCConfigMap(OpenShiftCLI): return {'changed': True, 'msg': 'CHECK_MODE: Would have performed a delete.'} api_rval = oc_cm.delete() + + if api_rval['returncode'] != 0: + return {'failed': True, 'msg': api_rval} + return {'changed': True, 'results': api_rval, 'state': state} ######## diff --git a/roles/lib_openshift/src/class/oc_configmap.py b/roles/lib_openshift/src/class/oc_configmap.py index c034ead36..87de3e1df 100644 --- a/roles/lib_openshift/src/class/oc_configmap.py +++ b/roles/lib_openshift/src/class/oc_configmap.py @@ -138,6 +138,10 @@ class OCConfigMap(OpenShiftCLI): return {'changed': True, 'msg': 'CHECK_MODE: Would have performed a delete.'} api_rval = oc_cm.delete() + + if api_rval['returncode'] != 0: + return {'failed': True, 'msg': api_rval} + return {'changed': True, 'results': api_rval, 'state': state} ######## -- cgit v1.2.3