From e4b4a9711201b3f891191ff15578c3cfac8b9a34 Mon Sep 17 00:00:00 2001
From: "Elizabeth K. Joseph" <lyz@princessleia.com>
Date: Mon, 17 Oct 2016 13:28:08 -0700
Subject: [PATCH] Add entercloudsuite cloud

Change-Id: Iea14c9c9a806bf123cdefa6d9bd6bb55ce153ade
---
 manifests/site.pp                                    |  2 ++
 .../templates/nodepool/clouds.yaml.erb               | 12 ++++++++++++
 .../templates/puppetmaster/all-clouds.yaml.erb       | 12 ++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index d9b543d9e8..7e2a0dc743 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -809,6 +809,8 @@ node 'nodepool.openstack.org' {
   $datacentred_project    = hiera('nodepool_datacentred_project', 'project')
   $citycloud_username = hiera('nodepool_citycloud_username', 'username')
   $citycloud_password = hiera('nodepool_citycloud_password')
+  $entercloud_username = hiera('nodepool_entercloud_username', 'username')
+  $entercloud_password = hiera('nodepool_entercloud_password')
   $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 f804b62fd2..6250f5035a 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -157,3 +157,15 @@ clouds:
       project_id: 1e6292e5893043a9b75ba0066079642c
       project_domain_name: default
       user_domain_id: c4a5013bd7e6427082ad11e5d260870d
+  entercloud:
+    regions:
+      - nl-ams1
+      - de-fra1
+      - it-mil1
+    profile: entercloudsuite
+    auth:
+      username: '<%= @entercloud_username %>'
+      password: '<%= @entercloud_password %>'
+      project_id: 1ceb779ea58d4e14b6238b3413f06634
+      user_domain_id: default
+      project_domain_id: default
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index a01faa4606..8fab9754ce 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -329,3 +329,15 @@ clouds:
       project_id: 1e6292e5893043a9b75ba0066079642c
       project_domain_name: default
       user_domain_id: c4a5013bd7e6427082ad11e5d260870d
+  openstackzuul-entercloud:
+    regions:
+      - nl-ams1
+      - de-fra1
+      - it-mil1
+    profile: entercloudsuite
+    auth:
+      username: <%= @puppetmaster_clouds['openstackzuul_entercloud_username'] %>
+      password: <%= @puppetmaster_clouds['openstackzuul_entercloud_password'] %>
+      project_id: 1ceb779ea58d4e14b6238b3413f06634
+      user_domain_id: default
+      project_domain_id: default