summaryrefslogtreecommitdiffstats
path: root/roles/openshift_aws
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-14 09:00:21 -0800
committerGitHub <noreply@github.com>2018-02-14 09:00:21 -0800
commitb90ec246f78ac66c4251996f9bb288875765ccaf (patch)
tree630a9dd527e7487089810b12419aef3eb1728a16 /roles/openshift_aws
parent75290a8e32d1658933b59957f8406e2379710ec2 (diff)
parent8faf061f0656b8816af4efe1015c1a9ed0d34c36 (diff)
downloadopenshift-b90ec246f78ac66c4251996f9bb288875765ccaf.tar.gz
openshift-b90ec246f78ac66c4251996f9bb288875765ccaf.tar.bz2
openshift-b90ec246f78ac66c4251996f9bb288875765ccaf.tar.xz
openshift-b90ec246f78ac66c4251996f9bb288875765ccaf.zip
Merge pull request #7135 from abutcher/node-accept-fail
Automatic merge from submit-queue. oc_adm_csr: allow requesting module failure when timeout reached
Diffstat (limited to 'roles/openshift_aws')
-rw-r--r--roles/openshift_aws/tasks/accept_nodes.yml1
1 files changed, 1 insertions, 0 deletions
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 }}"