From 2375a04fe4012807b592f53e07c558d2d8cc3ae3 Mon Sep 17 00:00:00 2001
From: "Elizabeth K. Joseph" <lyz@princessleia.com>
Date: Tue, 11 Oct 2016 17:00:03 -0700
Subject: [PATCH] Add datacentred cloud

Adding this cloud for a demonstration.

Change-Id: If1caa5114d09677386d7feb28a28cef319d35fbc
---
 manifests/site.pp                                      |  3 +++
 .../templates/nodepool/clouds.yaml.erb                 | 10 ++++++++++
 .../templates/puppetmaster/all-clouds.yaml.erb         | 10 ++++++++++
 3 files changed, 23 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index e31e78765a..697f412e42 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -791,6 +791,9 @@ node 'nodepool.openstack.org' {
   $vexxhost_username   = hiera('nodepool_vexxhost_username', 'username')
   $vexxhost_password   = hiera('nodepool_vexxhost_password')
   $vexxhost_project    = hiera('nodepool_vexxhost_project', 'project')
+  $datacentred_username   = hiera('nodepool_datacentred_username', 'username')
+  $datacentred_password   = hiera('nodepool_datacentred_password')
+  $datacentred_project    = hiera('nodepool_datacentred_project', 'project')
   $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
   class { 'openstack_project::server':
     sysadmins                 => hiera('sysadmins', []),
diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index 3ee9966de1..ddacafb1ec 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -135,3 +135,13 @@ clouds:
     identity_api_version: '3'
     floating_ip_source: None
     cacert: /home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem
+  datacentred:
+    region_name: sal01
+    profile: datacentred
+    auth:
+      username: '<%= @datacentred_username %>'
+      password: '<%= @datacentred_password %>'
+      project_name: '<%= @datacentred_project %>'
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: '2'
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index ca34c82868..1120d8b31f 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -307,3 +307,13 @@ clouds:
       username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>'
       password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>'
       project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>'
+  openstackzuul-datacentred:
+    region_name: sal01
+    profile: datacentred
+    auth:
+      username: <%= @puppetmaster_clouds['openstackzuul_datacentred_username'] %>
+      password: <%= @puppetmaster_clouds['openstackzuul_datacentred_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackzuul_datacentred_project'] %>
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: '2'