From 5d71aeee1f4403da4a74d3256e950281e70403b0 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Sat, 21 Sep 2013 09:40:08 -0700
Subject: [PATCH] Set nodepool boot-timeout to 120 seconds

HPCloud is taking longer than 60 seconds to boot vms.

Change-Id: Ia40684dde845c864abb7137827bdead39e9de4cb
---
 .../openstack_project/templates/nodepool/nodepool.yaml.erb  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 66c164f0f2..94844f430b 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -19,6 +19,7 @@ providers:
     password: '<%= rackspace_password %>'
     project-id: '<%= rackspace_project %>'
     auth-url: 'https://identity.api.rackspacecloud.com/v2.0/'
+    boot-timeout: 120
     max-servers: 60
     images:
       - name: devstack-precise-dfw
@@ -35,6 +36,7 @@ providers:
     password: '<%= rackspace_password %>'
     project-id: '<%= rackspace_project %>'
     auth-url: 'https://identity.api.rackspacecloud.com/v2.0/'
+    boot-timeout: 120
     max-servers: 60
     images:
       - name: devstack-precise-ord
@@ -51,6 +53,7 @@ providers:
     password: '<%= rackspace_password %>'
     project-id: '<%= rackspace_project %>'
     auth-url: 'https://identity.api.rackspacecloud.com/v2.0/'
+    boot-timeout: 120
     max-servers: 60
     images:
       - name: devstack-precise-iad
@@ -67,6 +70,7 @@ providers:
     password: '<%= hpcloud_password %>'
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
+    boot-timeout: 120
     max-servers: 83
     images:
       - name: devstack-precise
@@ -83,6 +87,7 @@ providers:
     password: '<%= hpcloud_password %>'
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
+    boot-timeout: 120
     max-servers: 83
     images:
       - name: devstack-precise
@@ -99,6 +104,7 @@ providers:
     password: '<%= hpcloud_password %>'
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
+    boot-timeout: 120
     max-servers: 83
     images:
       - name: devstack-precise