From 899f40bdd23b22f3100287088a1e475226e293ff Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@linux.vnet.ibm.com>
Date: Tue, 6 Oct 2015 10:28:04 -0700
Subject: [PATCH] Use OVH for ubuntu-trusty

This puts ubuntu-trusty in production on OVH, but limits the number
of servers from that provider nodepool will use, so if there is a
problem, it will not be widespread.

Change-Id: Ief5e0c7e4dffd262f1df9c549bfc267a1cc8b849
---
 .../templates/nodepool/nodepool.yaml.erb               | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 8067d9a1e8..ae25f4429f 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -129,6 +129,7 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
+      - name: ovh-gra1
   - name: ubuntu-trusty-check
     image: ubuntu-trusty-check
     min-ready: 1
@@ -148,6 +149,7 @@ labels:
       - name: hpcloud-b3
       - name: hpcloud-b4
       - name: hpcloud-b5
+      - name: ovh-gra1
   - name: devstack-trusty-2-node
     image: devstack-trusty
     ready-script: multinode_setup.sh
@@ -952,7 +954,7 @@ providers:
     cloud: ovh
     api-timeout: 60
     boot-timeout: 120
-    max-servers: 50
+    max-servers: 2
     rate: 0.1
     image-type: raw
     images:
@@ -962,6 +964,12 @@ providers:
         diskimage: ubuntu-trusty
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: ubuntu-trusty
+        min-ram: 8000
+        name-filter: 'ssd-osFoundation'
+        diskimage: ubuntu-trusty
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
   - name: tripleo-test-cloud-rh1
     cloud: tripleo-test-cloud-rh1
     boot-timeout: 120