From 9c988fa7f135ace8cab9fd2ca6405ee270faec29 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 14 Jan 2015 08:33:27 -0800
Subject: [PATCH] Set api timeouts on hpcloud to one minute

We have had connections regularly hang when communicating with hpcloud
api endpoints. These connections stick around for hours backing up all
nodepool work against that cloud. Mitigate this by setting an api
request timeout of one minute on the hpcloud provider managers.

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

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 56e206a72b..2bbe008275 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -504,6 +504,7 @@ providers:
     password: '<%= hpcloud_password %>'
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
+    api-timeout: 60
     boot-timeout: 120
     max-servers: 100
     networks:
@@ -601,6 +602,7 @@ providers:
     password: '<%= hpcloud_password %>'
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
+    api-timeout: 60
     boot-timeout: 120
     max-servers: 100
     networks:
@@ -698,6 +700,7 @@ providers:
     password: '<%= hpcloud_password %>'
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
+    api-timeout: 60
     boot-timeout: 120
     max-servers: 100
     networks:
@@ -795,6 +798,7 @@ providers:
     password: '<%= hpcloud_password %>'
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
+    api-timeout: 60
     boot-timeout: 120
     max-servers: 100
     networks:
@@ -893,6 +897,7 @@ providers:
     password: '<%= hpcloud_password %>'
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
+    api-timeout: 60
     boot-timeout: 120
     max-servers: 100
     networks: