From 305c08660f15cf2612d9cad1f42e1b84884bc184 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@linux.vnet.ibm.com>
Date: Wed, 16 Sep 2015 14:17:01 -0700
Subject: [PATCH] Add OVH to nodepool

Change-Id: I785d8fd57725d743bb6354ed0173c27f483376d5
---
 manifests/site.pp                             |  3 +++
 .../manifests/nodepool_prod.pp                |  3 +++
 .../templates/nodepool/clouds.yaml.erb        |  7 +++++++
 .../templates/nodepool/nodepool.yaml.erb      | 20 +++++++++++++++++++
 4 files changed, 33 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index a3629ca2b0..3bb54559ee 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -647,6 +647,9 @@ node 'nodepool.openstack.org' {
     hpcloud_username         => hiera('nodepool_hpcloud_username', 'username'),
     hpcloud_password         => hiera('nodepool_hpcloud_password', 'XXX'),
     hpcloud_project          => hiera('nodepool_hpcloud_project', 'project'),
+    ovh_username             => hiera('nodepool_ovh_username', 'username'),
+    ovh_password             => hiera('nodepool_ovh_password', 'XXX'),
+    ovh_project              => hiera('nodepool_ovh_project', 'project'),
     tripleo_username         => hiera('nodepool_tripleo_username', 'username'),
     tripleo_password         => hiera('nodepool_tripleo_password', 'XXX'),
     tripleo_project          => hiera('nodepool_tripleo_project', 'project'),
diff --git a/modules/openstack_project/manifests/nodepool_prod.pp b/modules/openstack_project/manifests/nodepool_prod.pp
index f280fd3203..da01332039 100644
--- a/modules/openstack_project/manifests/nodepool_prod.pp
+++ b/modules/openstack_project/manifests/nodepool_prod.pp
@@ -18,6 +18,9 @@ class openstack_project::nodepool_prod(
   $hpcloud_username ='',
   $hpcloud_password ='',
   $hpcloud_project ='',
+  $ovh_username ='',
+  $ovh_password ='',
+  $ovh_project ='',
   $tripleo_username ='',
   $tripleo_password ='',
   $tripleo_project ='',
diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index 713bf185d3..07e3f5e663 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -13,6 +13,13 @@ clouds:
       username: '<%= hpcloud_username %>'
       password: '<%= hpcloud_password %>'
       project_name: '<%= hpcloud_project %>'
+  ovh:
+    profile: ovh
+    region_name: gra1
+    auth:
+      username: '<%= ovh_username %>'
+      password: '<%= ovh_password %>'
+      project_name: '<%= ovh_project %>'
   tripleo-test-cloud-rh1:
     auth:
       username: '<%= tripleo_username %>'
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 6837aeb2af..6d6b6e61b4 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -129,6 +129,11 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
+  - name: ubuntu-trusty-check
+    image: ubuntu-trusty-check
+    min-ready: 1
+    providers:
+      - name: ovh-gra1
   - name: ubuntu-trusty-2-node
     image: ubuntu-trusty
     ready-script: multinode_setup.sh
@@ -902,6 +907,21 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+  - name: ovh-gra1
+    region-name: 'gra1'
+    cloud: ovh
+    api-timeout: 60
+    boot-timeout: 120
+    max-servers: 50
+    rate: 0.1
+    image-type: raw
+    images:
+      - name: ubuntu-trusty-check
+        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