summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-02-22 16:36:18 -0500
committerKenny Woodson <kwoodson@redhat.com>2017-02-22 16:36:18 -0500
commit50fa8cd61d47e8a3e3ab4a670fc173a0cfba5bc3 (patch)
tree0ef512c6eae5950594a81c273345828cd3b8c16d /roles/lib_openshift
parentf0a32af0548eb309b9bb3bb2c366d35bdfab1847 (diff)
downloadopenshift-50fa8cd61d47e8a3e3ab4a670fc173a0cfba5bc3.tar.gz
openshift-50fa8cd61d47e8a3e3ab4a670fc173a0cfba5bc3.tar.bz2
openshift-50fa8cd61d47e8a3e3ab4a670fc173a0cfba5bc3.tar.xz
openshift-50fa8cd61d47e8a3e3ab4a670fc173a0cfba5bc3.zip
Attempt to handle router preparation errors.
Diffstat (limited to 'roles/lib_openshift')
-rw-r--r--roles/lib_openshift/library/oc_adm_router.py11
-rw-r--r--roles/lib_openshift/src/class/oc_adm_router.py11
2 files changed, 16 insertions, 6 deletions
diff --git a/roles/lib_openshift/library/oc_adm_router.py b/roles/lib_openshift/library/oc_adm_router.py
index 324b87f84..ef4483c3c 100644
--- a/roles/lib_openshift/library/oc_adm_router.py
+++ b/roles/lib_openshift/library/oc_adm_router.py
@@ -2501,8 +2501,11 @@ class Router(OpenShiftCLI):
''' property for the prepared router'''
if self.__prepared_router is None:
results = self._prepare_router()
- if not results:
- raise RouterException('Could not perform router preparation')
+ if not results or 'returncode' in results and results['returncode'] != 0:
+ if 'stderr' in results:
+ raise RouterException('Could not perform router preparation: %s' % results['stderr'])
+
+ raise RouterException('Could not perform router preparation.')
self.__prepared_router = results
return self.__prepared_router
@@ -2665,7 +2668,7 @@ class Router(OpenShiftCLI):
results = self.openshift_cmd(cmd, oadm=True, output=True, output_type='json')
# pylint: disable=no-member
- if results['returncode'] != 0 and 'items' in results['results']:
+ if results['returncode'] != 0 or 'items' not in results['results']:
return results
oc_objects = {'DeploymentConfig': {'obj': None, 'path': None, 'update': False},
@@ -2705,9 +2708,11 @@ class Router(OpenShiftCLI):
'''Create a deploymentconfig '''
results = []
+ import time
# pylint: disable=no-member
for _, oc_data in self.prepared_router.items():
if oc_data['obj'] is not None:
+ time.sleep(1)
results.append(self._create(oc_data['path']))
rval = 0
diff --git a/roles/lib_openshift/src/class/oc_adm_router.py b/roles/lib_openshift/src/class/oc_adm_router.py
index ab7c96927..899456945 100644
--- a/roles/lib_openshift/src/class/oc_adm_router.py
+++ b/roles/lib_openshift/src/class/oc_adm_router.py
@@ -49,8 +49,11 @@ class Router(OpenShiftCLI):
''' property for the prepared router'''
if self.__prepared_router is None:
results = self._prepare_router()
- if not results:
- raise RouterException('Could not perform router preparation')
+ if not results or 'returncode' in results and results['returncode'] != 0:
+ if 'stderr' in results:
+ raise RouterException('Could not perform router preparation: %s' % results['stderr'])
+
+ raise RouterException('Could not perform router preparation.')
self.__prepared_router = results
return self.__prepared_router
@@ -213,7 +216,7 @@ class Router(OpenShiftCLI):
results = self.openshift_cmd(cmd, oadm=True, output=True, output_type='json')
# pylint: disable=no-member
- if results['returncode'] != 0 and 'items' in results['results']:
+ if results['returncode'] != 0 or 'items' not in results['results']:
return results
oc_objects = {'DeploymentConfig': {'obj': None, 'path': None, 'update': False},
@@ -253,9 +256,11 @@ class Router(OpenShiftCLI):
'''Create a deploymentconfig '''
results = []
+ import time
# pylint: disable=no-member
for _, oc_data in self.prepared_router.items():
if oc_data['obj'] is not None:
+ time.sleep(1)
results.append(self._create(oc_data['path']))
rval = 0