From f7cb9c3108b4badaa68ad380d63ea428dbbfe146 Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@spencerkrum.com>
Date: Tue, 2 Feb 2016 18:22:41 -0800
Subject: [PATCH] Add OmfraCloud to puppetmaster_clouds

I have verified the hiera settings. Omfracloud uses a self-signed cert,
so vendor in the CA file.

Change-Id: I8b5b2d1c2bb8a9f808a6ea8e5134cb17da8ee133
---
 manifests/site.pp                             |  9 ++++---
 .../manifests/puppetmaster.pp                 |  9 +++++++
 .../puppetmaster/all-clouds.yaml.erb          | 26 +++++++++++++++++++
 .../puppetmaster/ansible-clouds.yaml.erb      |  9 +++++++
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index be004a1e14..d3f2ab6f21 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -223,10 +223,11 @@ node 'puppetmaster.openstack.org' {
     pin_puppet                => '3.6.',
   }
   class { 'openstack_project::puppetmaster':
-    root_rsa_key        => hiera('puppetmaster_root_rsa_key'),
-    jenkins_api_user    => hiera('jenkins_api_user', 'username'),
-    jenkins_api_key     => hiera('jenkins_api_key'),
-    puppetmaster_clouds => hiera('puppetmaster_clouds'),
+    root_rsa_key                               => hiera('puppetmaster_root_rsa_key'),
+    jenkins_api_user                           => hiera('jenkins_api_user', 'username'),
+    jenkins_api_key                            => hiera('jenkins_api_key'),
+    puppetmaster_clouds                        => hiera('puppetmaster_clouds'),
+    infracloud_hpuswest_ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
   }
 }
 
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index d8787efbdd..52c5b3991f 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -3,6 +3,7 @@
 class openstack_project::puppetmaster (
   $jenkins_api_key,
   $puppetmaster_clouds,
+  $infracloud_hpuswest_ssl_cert_file_contents,
   $jenkins_api_user = 'hudson-openstack',
   $root_rsa_key = 'xxx',
   $puppetdb = true,
@@ -127,6 +128,14 @@ class openstack_project::puppetmaster (
     content => template('openstack_project/puppetmaster/ansible-clouds.yaml.erb'),
   }
 
+  file { '/etc/openstack/infracloud_west_cacert.pem':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0600',
+    content => $infracloud_hpuswest_ssl_cert_file_contents,
+  }
+
 # For puppet master apache serving.
   package { 'puppetmaster-passenger':
     ensure => present,
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index 2b95aebc1e..94d6609b4a 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -77,6 +77,32 @@ clouds:
       username: <%= @puppetmaster_clouds['openstackjenkins_bluebox_username'] %>
       password: <%= @puppetmaster_clouds['openstackjenkins_bluebox_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %>
+  openstackjenkins-infracloud-west:
+    region_name: RegionOne
+    auth:
+      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3
+      username: <%= @puppetmaster_clouds['openstackjenkins_infracloud_username'] %>
+      password: <%= @puppetmaster_clouds['openstackjenkins_infracloud_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackjenkins_infracloud_project_name'] %>
+      cacert: '/etc/openstack/infracloud_west_cacert.pem'
+      auth_type: 'v3password'
+      identity_api_version: '3'
+      floating_ip_source: 'None'
+      project_domain_id: default
+      user_domain_id: default
+  openstackci-infracloud-west:
+    region_name: RegionOne
+    auth:
+      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3
+      username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
+      cacert: '/etc/openstack/infracloud_west_cacert.pem'
+      auth_type: 'v3password'
+      identity_api_version: '3'
+      floating_ip_source: 'None'
+      project_domain_id: default
+      user_domain_id: default
   openstackjenkins-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 7ccad3c727..2c9c40cbc9 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -38,3 +38,12 @@ clouds:
       username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_rax_password'] %>
       project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %>
+  openstackci-infracloud-west:
+    region_name: RegionOne
+    auth:
+      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3
+      username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
+      project_domain_id: default
+      user_domain_id: default