summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/library
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-03-13 09:51:40 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-03-13 09:51:40 -0400
commit0ef91c501ad62fd915836f7a6802d70812ae78a0 (patch)
treeeabeb5a31b8478fdb24012d0b2f22afc2f3450c7 /roles/lib_openshift/library
parent608b6debb28d9b477d21cd78f01d0bfbcd04cd01 (diff)
downloadopenshift-0ef91c501ad62fd915836f7a6802d70812ae78a0.tar.gz
openshift-0ef91c501ad62fd915836f7a6802d70812ae78a0.tar.bz2
openshift-0ef91c501ad62fd915836f7a6802d70812ae78a0.tar.xz
openshift-0ef91c501ad62fd915836f7a6802d70812ae78a0.zip
Raise on dry-run failures.
Diffstat (limited to 'roles/lib_openshift/library')
-rw-r--r--roles/lib_openshift/library/oc_adm_registry.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/lib_openshift/library/oc_adm_registry.py b/roles/lib_openshift/library/oc_adm_registry.py
index c398c5551..9eb268388 100644
--- a/roles/lib_openshift/library/oc_adm_registry.py
+++ b/roles/lib_openshift/library/oc_adm_registry.py
@@ -2235,8 +2235,8 @@ class Registry(OpenShiftCLI):
''' prepared_registry property '''
if not self.__prepared_registry:
results = self.prepare_registry()
- if not results:
- raise RegistryException('Could not perform registry preparation.')
+ if not results or ('returncode' in results and results['returncode'] != 0):
+ raise RegistryException('Could not perform registry preparation. {}'.format(results))
self.__prepared_registry = results
return self.__prepared_registry
@@ -2301,8 +2301,8 @@ class Registry(OpenShiftCLI):
# probably need to parse this
# pylint thinks results is a string
# pylint: disable=no-member
- if results['returncode'] != 0 and 'items' in results['results']:
- return results
+ if results['returncode'] != 0 and 'items' not in results['results']:
+ raise RegistryException('Could not perform registry preparation. {}'.format(results))
service = None
deploymentconfig = None