From 38a80d6044e58ca164dced15b29780ea71997716 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Fri, 21 Feb 2014 09:05:51 +1300
Subject: [PATCH] Revert "Remove tripleo from nodepool config"

This reverts commit c982db10ffca4206a1c3f496fbe59a23bb1bac15.

We now have a) fixed nodepool to be less affected by outages, b)
restored the tripleo cloud to service and c) added a new pipeline to
make outages affect other people less.

Change-Id: I99972b8cae537bea259abb835ed12c3405df5e85
---
 .../templates/nodepool/nodepool.yaml.erb      | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 26f82afd5e..c2dec61d3a 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -256,6 +256,26 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+  - name: tripleo-test-cloud
+    service-type: 'compute'
+    service-name: 'nova'
+    username: '<%= tripleo_username %>'
+    password: '<%= tripleo_password %>'
+    project-id: '<%= tripleo_project %>'
+    auth-url: 'https://ci-overcloud.tripleo.org:13000/v2.0'
+    boot-timeout: 120
+    max-servers: 190
+    networks:
+      - net-id: f69ac547-db64-4e69-ae70-e5233634aff0
+      - net-id: b54c5011-519a-4364-8256-a9214eec2387
+    images:
+      - name: tripleo-precise
+        base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit'
+        min-ram: 8192
+        name-filter: h1
+        setup: prepare_node_tripleo.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
 
 
 targets:
@@ -301,6 +321,10 @@ targets:
           - name: rax-iad
           - name: rax-dfw
           - name: rax-ord
+      - name: tripleo-precise
+        min-ready: 5
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins02
     jenkins:
       url: 'https://jenkins02.openstack.org/'
@@ -343,6 +367,10 @@ targets:
           - name: rax-iad
           - name: rax-dfw
           - name: rax-ord
+      - name: tripleo-precise
+        min-ready: 5
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins03
     jenkins:
       url: 'https://jenkins03.openstack.org/'
@@ -385,6 +413,10 @@ targets:
           - name: rax-iad
           - name: rax-dfw
           - name: rax-ord
+      - name: tripleo-precise
+        min-ready: 5
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins04
     jenkins:
       url: 'https://jenkins04.openstack.org/'
@@ -427,6 +459,10 @@ targets:
           - name: rax-iad
           - name: rax-dfw
           - name: rax-ord
+      - name: tripleo-precise
+        min-ready: 5
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins05
     jenkins:
       url: 'https://jenkins05.openstack.org/'
@@ -469,6 +505,10 @@ targets:
           - name: rax-iad
           - name: rax-dfw
           - name: rax-ord
+      - name: tripleo-precise
+        min-ready: 5
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins06
     jenkins:
       url: 'https://jenkins06.openstack.org/'
@@ -511,6 +551,10 @@ targets:
           - name: rax-iad
           - name: rax-dfw
           - name: rax-ord
+      - name: tripleo-precise
+        min-ready: 5
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins07
     jenkins:
       url: 'https://jenkins07.openstack.org/'
@@ -557,3 +601,7 @@ targets:
         min-ready: 1
         providers:
           - name: rax-dfw
+      - name: tripleo-precise
+        min-ready: 5
+        providers:
+          - name: tripleo-test-cloud