From eefbb633b499a6c4b1d9da7b27eb597d8abb64ee Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Sat, 5 Oct 2013 08:26:20 -0700
Subject: [PATCH] Start using gearman-based bursting with nodepool

Also, reduce number of ready nodes slightly to better observe how
nodepool reacts.

Allow nodepool to talk to zuul's gearman server.

Change-Id: I764482062525b6ca5454b53cbd56861b24fd3764
---
 manifests/site.pp                             |  1 +
 .../templates/nodepool/nodepool.yaml.erb      | 19 +++++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 61938567d4..64c29c74bd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -395,6 +395,7 @@ node 'zuul.openstack.org' {
     sysadmins            => hiera('sysadmins'),
     statsd_host          => 'graphite.openstack.org',
     gearman_workers      => [
+      'nodepool.openstack.org',
       'jenkins.openstack.org',
       'jenkins01.openstack.org',
       'jenkins02.openstack.org',
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 0b9e5aef55..5e153fa9dd 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -10,6 +10,9 @@ zmq-publishers:
   - tcp://jenkins01.openstack.org:8888
   - tcp://jenkins02.openstack.org:8888
 
+gearman-servers:
+  - host: zuul.openstack.org
+
 providers:
   - name: rax-dfw
     region-name: 'DFW'
@@ -123,21 +126,17 @@ targets:
       credentials-id: '<%= jenkins_credentials_id %>'
     images:
       - name: devstack-precise
+        min-ready: 20
         providers:
           - name: hpcloud-az1
-            min-ready: 10
           - name: hpcloud-az2
-            min-ready: 10
           - name: hpcloud-az3
-            min-ready: 10
       - name: devstack-precise-check
+        min-ready: 10
         providers:
           - name: rax-iad
-            min-ready: 10
           - name: rax-dfw
-            min-ready: 5
           - name: rax-ord
-            min-ready: 10
   - name: jenkins02
     jenkins:
       url: 'https://jenkins02.openstack.org/'
@@ -146,18 +145,14 @@ targets:
       credentials-id: '<%= jenkins_credentials_id %>'
     images:
       - name: devstack-precise
+        min-ready: 20
         providers:
           - name: hpcloud-az1
-            min-ready: 10
           - name: hpcloud-az2
-            min-ready: 10
           - name: hpcloud-az3
-            min-ready: 10
       - name: devstack-precise-check
+        min-ready: 10
         providers:
           - name: rax-iad
-            min-ready: 10
           - name: rax-dfw
-            min-ready: 5
           - name: rax-ord
-            min-ready: 10