From 8faf061f0656b8816af4efe1015c1a9ed0d34c36 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Tue, 13 Feb 2018 13:51:17 -0500 Subject: oc_adm_csr: Add fail_on_timeout parameter which causes module to fail when timeout was reached. --- roles/lib_openshift/library/oc_adm_csr.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'roles/lib_openshift/library') diff --git a/roles/lib_openshift/library/oc_adm_csr.py b/roles/lib_openshift/library/oc_adm_csr.py index c78e379d5..bb834deb0 100644 --- a/roles/lib_openshift/library/oc_adm_csr.py +++ b/roles/lib_openshift/library/oc_adm_csr.py @@ -1639,6 +1639,7 @@ def main(): timeout=dict(default=30, type='int'), approve_all=dict(default=False, type='bool'), service_account=dict(default='node-bootstrapper', type='str'), + fail_on_timeout=dict(default=False, type='bool'), ), supports_check_mode=True, mutually_exclusive=[['approve_all', 'nodes']], @@ -1649,6 +1650,12 @@ def main(): rval = OCcsr.run_ansible(module.params, module.check_mode) + # If we timed out then we weren't finished. Fail if user requested to fail. + if (module.params['timeout'] > 0 and + module.params['fail_on_timeout'] and + rval['timeout']): + return module.fail_json(msg='Timed out accepting certificate signing requests. Failing as requested.', **rval) + if 'failed' in rval: return module.fail_json(**rval) -- cgit v1.2.3