From 7f0e0f17cd3541c95bf95b53f01a9536ce53df32 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 3 Jan 2018 10:29:00 -0500
Subject: [PATCH] Revert "Remove ovh from clouds.yaml files"

This reverts commit fc889368515687a0957002b2b3886b75e4f74aeb.

Change-Id: I0bd6705335f8915cf1e59ffb33c959d634ceedda
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .../puppetmaster/all-clouds.yaml.erb          | 26 +++++++++++++++++++
 .../puppetmaster/ansible-clouds.yaml.erb      | 13 ++++++++++
 2 files changed, 39 insertions(+)

diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index fd9d83b148..c93c7cbeb8 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -69,6 +69,19 @@ clouds:
           networks:
             - name: inap-17304-WAN1101
               routes_externally: True
+  openstackci-ovh:
+    regions:
+      - GRA1
+      - SBG1
+      - BHS1
+    profile: ovh
+    # OVH has a weird new ipv6 setup that we can't handle properly
+    # for now ignore ipv6
+    force_ipv4: true
+    auth:
+      username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_ovh_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_ovh_project_name'] %>
   openstackci-rax:
     regions:
       - DFW
@@ -113,6 +126,19 @@ clouds:
       username: <%= @puppetmaster_clouds['openstackjenkins_rax_username'] %>
       password: <%= @puppetmaster_clouds['openstackjenkins_rax_password'] %>
       project_id: <%= @puppetmaster_clouds['openstackjenkins_rax_project_id'] %>
+  openstackjenkins-ovh:
+    regions:
+      - GRA1
+      - SBG1
+      - BHS1
+    profile: ovh
+    # OVH has a weird new ipv6 setup that we can't handle properly
+    # for now ignore ipv6
+    force_ipv4: true
+    auth:
+      username: <%= @puppetmaster_clouds['openstackjenkins_ovh_username'] %>
+      password: <%= @puppetmaster_clouds['openstackjenkins_ovh_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackjenkins_ovh_project_name'] %>
   openstack-rax:
     regions:
       - DFW
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index 19b3138e71..f5dffcf20d 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -22,6 +22,19 @@ clouds:
           networks:
             - name: inap-17301-WAN1102
               routes_externally: True
+  openstackci-ovh:
+    regions:
+      - GRA1
+      - SBG1
+      - BHS1
+    profile: ovh
+    # OVH has a weird new ipv6 setup that we can't handle properly
+    # for now ignore ipv6
+    force_ipv4: true
+    auth:
+      username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_ovh_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_ovh_project_name'] %>
   openstackci-rax:
     regions:
       - DFW