From 065b0f181afe69dfc7e5f66ad77b7e059da9282b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 11 Apr 2014 10:36:10 -0700
Subject: [PATCH] Don't use hpcloud as a label provider.

Instead of completely removing hpcloud from the nodepool config, just
remove hpcloud regions from label providers. That way hpcloud can build
images but won't provide any Jenkins slaves.

Change-Id: Ie3d465b8ffac182e46f2a54c6d72c6170b8c9575
---
 .../templates/nodepool/nodepool.yaml.erb         | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index a2fa094eff..00c543e583 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -26,10 +26,6 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
-      - name: hpcloud-az1
-      - name: hpcloud-az2
-      - name: hpcloud-az3
-      - name: hpcloud-region-b
   - name: devstack-precise-check
     image: devstack-precise-check
     min-ready: 7
@@ -42,10 +38,6 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
-      - name: hpcloud-az1
-      - name: hpcloud-az2
-      - name: hpcloud-az3
-      - name: hpcloud-region-b
   - name: bare-centos6
     image: bare-centos6
     min-ready: 14
@@ -53,10 +45,6 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
-      - name: hpcloud-az1
-      - name: hpcloud-az2
-      - name: hpcloud-az3
-      - name: hpcloud-region-b
   - name: py3k-precise
     image: py3k-precise
     min-ready: 7
@@ -64,10 +52,6 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
-      - name: hpcloud-az1
-      - name: hpcloud-az2
-      - name: hpcloud-az3
-      - name: hpcloud-region-b
   - name: dsvm-precise-krnl
     image: dsvm-precise-krnl
     min-ready: 1