From 0bdf4045aa19fea7c20088b79c3e83448703b1e9 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 11 Apr 2014 19:57:54 +0000
Subject: [PATCH] Reenable hpcloud in nodepool

Network performance between hpcloud workers and servers in rax-dfw
have returned to acceptable levels, so return node labels and
max-servers counts to their previous values.

Also add the devstack-precise-check label back to work around
https://storyboard.openstack.org/#!/story/64 and temporarily leave
az1 and az2 out of the bare-centos6 set until Clark has an
opportunity to finish building updated images there.

Change-Id: Id1a89dff94b38c64f655577f0040bcc1f78aa479
---
 .../templates/nodepool/nodepool.yaml.erb      | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index f5ce0a0eb9..f817480dd3 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -23,13 +23,26 @@ labels:
     image: devstack-precise
     min-ready: 42
     providers:
+      - name: hpcloud-az1
+      - name: hpcloud-az2
+      - name: hpcloud-az3
+      - name: hpcloud-region-b
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
+  - name: devstack-precise-check
+    image: devstack-precise-check
+    min-ready: 7
+    providers:
+      - name: rax-iad
   - name: bare-precise
     image: bare-precise
     min-ready: 42
     providers:
+      - name: hpcloud-az1
+      - name: hpcloud-az2
+      - name: hpcloud-az3
+      - name: hpcloud-region-b
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
@@ -37,6 +50,8 @@ labels:
     image: bare-centos6
     min-ready: 21
     providers:
+      - name: hpcloud-az3
+      - name: hpcloud-region-b
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
@@ -44,6 +59,10 @@ labels:
     image: py3k-precise
     min-ready: 21
     providers:
+      - name: hpcloud-az1
+      - name: hpcloud-az2
+      - name: hpcloud-az3
+      - name: hpcloud-region-b
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
@@ -207,7 +226,7 @@ providers:
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
     boot-timeout: 180
-    max-servers: 0
+    max-servers: 48
     images:
       - name: devstack-precise
         base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
@@ -242,7 +261,7 @@ providers:
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
     boot-timeout: 180
-    max-servers: 0
+    max-servers: 192
     images:
       - name: devstack-precise
         base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
@@ -277,7 +296,7 @@ providers:
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
     boot-timeout: 180
-    max-servers: 0
+    max-servers: 48
     images:
       - name: devstack-precise
         base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
@@ -329,7 +348,7 @@ providers:
     project-id: '<%= hpcloud_project %>'
     auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
     boot-timeout: 120
-    max-servers: 0
+    max-servers: 200
     images:
       - name: devstack-precise-check
         base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'