Merge pull request CentOS-PaaS-SIG#808 from samvarankashyap/aws_wait_…

…timeout
samvarankashyap · Nov 29, 2018 · f5a6149 · f5a6149
2 parents 47849fd + 6c5dd20
commit f5a6149
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/linchpin/provision/roles/aws/files/schema.json b/linchpin/provision/roles/aws/files/schema.json
@@ -19,7 +19,8 @@
                     "security_group": { "type": ["list", "string"], "required": false },
                     "vpc_subnet_id": { "type": "string", "required": false },
                     "assign_public_ip": { "type": "boolean", "required": false },
-                    "instance_tags": { "type": "dict", "required": false }
+                    "instance_tags": { "type": "dict", "required": false },
+                    "wait_timeout": { "type": "integer", "required": false }
                 }
             },
             {

diff --git a/linchpin/provision/roles/aws/tasks/provision_aws_ec2.yml b/linchpin/provision/roles/aws/tasks/provision_aws_ec2.yml
@@ -18,6 +18,7 @@
     image: "{{ res_def['image'] }}"
     region: "{{ res_def['region'] }}"
     wait: yes
+    wait_timeout: "{{ res_def['wait_timeout'] | default(600) }}"
     group: "{{ res_def['security_group']| default('default') }}"
     count: "{{ res_def['count'] }}"
     vpc_subnet_id: "{{ res_def['vpc_subnet_id']| default(omit) }}"
@@ -41,6 +42,7 @@
     image: "{{ res_def['image'] }}"
     region: "{{ res_def['region'] }}"
     wait: yes
+    wait_timeout: "{{ res_def['wait_timeout'] | default(600) }}"
     group: "{{ res_def['security_group']| default('default') }}"
     count: "{{ res_def['count'] }}"
     vpc_subnet_id: "{{ res_def['vpc_subnet_id']| default(omit) }}"