Browse Source

Merge pull request #8032 from sdodson/oc_adm_csr_timeout

oc_adm_csr - return timeout on other failures
OpenShift Merge Robot 7 years ago
parent
commit
aed1ce672c

+ 1 - 1
roles/lib_openshift/library/oc_adm_csr.py

@@ -1664,7 +1664,7 @@ class OCcsr(OpenShiftCLI):
 
             for result in all_results:
                 if result['returncode'] != 0:
-                    return {'failed': True, 'msg': all_results}
+                    return {'failed': True, 'msg': all_results, 'timeout': timeout}
 
             return dict(changed=len(all_results) > 0,
                         results=all_results,

+ 1 - 1
roles/lib_openshift/src/class/oc_adm_csr.py

@@ -196,7 +196,7 @@ class OCcsr(OpenShiftCLI):
 
             for result in all_results:
                 if result['returncode'] != 0:
-                    return {'failed': True, 'msg': all_results}
+                    return {'failed': True, 'msg': all_results, 'timeout': timeout}
 
             return dict(changed=len(all_results) > 0,
                         results=all_results,