diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2018-02-13 13:51:17 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2018-02-13 14:16:34 -0500 |
| commit | 8faf061f0656b8816af4efe1015c1a9ed0d34c36 (patch) | |
| tree | 8cea184aae58670dab53e825a6c14512c3216602 | |
| parent | f1263cb5edbe409fd044a37a395cc5b49e48dfeb (diff) | |
| download | openshift-8faf061f0656b8816af4efe1015c1a9ed0d34c36.tar.gz openshift-8faf061f0656b8816af4efe1015c1a9ed0d34c36.tar.bz2 openshift-8faf061f0656b8816af4efe1015c1a9ed0d34c36.tar.xz openshift-8faf061f0656b8816af4efe1015c1a9ed0d34c36.zip | |
oc_adm_csr: Add fail_on_timeout parameter which causes module to fail when timeout was reached.
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_csr.py | 7 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_adm_csr.py | 7 | ||||
| -rw-r--r-- | roles/openshift_aws/tasks/accept_nodes.yml | 1 |
3 files changed, 15 insertions, 0 deletions
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) diff --git a/roles/lib_openshift/src/ansible/oc_adm_csr.py b/roles/lib_openshift/src/ansible/oc_adm_csr.py index 9e43a810b..7b5e245d4 100644 --- a/roles/lib_openshift/src/ansible/oc_adm_csr.py +++ b/roles/lib_openshift/src/ansible/oc_adm_csr.py @@ -16,6 +16,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']], @@ -26,6 +27,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) diff --git a/roles/openshift_aws/tasks/accept_nodes.yml b/roles/openshift_aws/tasks/accept_nodes.yml index db30fe5c9..cc0cdcb0b 100644 --- a/roles/openshift_aws/tasks/accept_nodes.yml +++ b/roles/openshift_aws/tasks/accept_nodes.yml @@ -37,5 +37,6 @@ #approve_all: True nodes: "{{ instancesout.instances|map(attribute='private_dns_name') | list }}" timeout: 60 + fail_on_timeout: "{{ openshift_aws_node_accept_fail_on_timeout | default(false) | bool }}" register: nodeout delegate_to: "{{ groups.masters.0 }}" |