From b4d1b7f3a2a0a6ef9bd016b00ddf12e4eb4ec193 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Mon, 5 Aug 2013 15:53:01 -0700
Subject: [PATCH] Use jenkins credentials store with d-g

on the new jenkins systems.

Change-Id: I9d6c079abcc75cd0cf0acb3bcdad15be5a87ce28
---
 manifests/site.pp                                              | 2 ++
 modules/openstack_project/manifests/devstack_launch_slave.pp   | 1 +
 .../openstack_project/templates/devstack-gate-secure.conf.erb  | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index f7c7051bd6..1406ac0c1a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -417,6 +417,7 @@ node 'devstack-launch01.slave.openstack.org' {
     jenkins_ssh_public_key  => $openstack_project::jenkins_ssh_key,
     jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
     jenkins_server          => 'jenkins01.openstack.org',
+    jenkins_credentials_id  => '8bcc2a78-0ce9-4383-aa14-039da7daf335',
   }
 }
 
@@ -428,6 +429,7 @@ node 'devstack-launch02.slave.openstack.org' {
     jenkins_ssh_public_key  => $openstack_project::jenkins_ssh_key,
     jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
     jenkins_server          => 'jenkins02.openstack.org',
+    jenkins_credentials_id  => '8bcc2a78-0ce9-4383-aa14-039da7daf335',
   }
 }
 
diff --git a/modules/openstack_project/manifests/devstack_launch_slave.pp b/modules/openstack_project/manifests/devstack_launch_slave.pp
index dcf40a69a5..d4a4ed83a1 100644
--- a/modules/openstack_project/manifests/devstack_launch_slave.pp
+++ b/modules/openstack_project/manifests/devstack_launch_slave.pp
@@ -20,6 +20,7 @@ class openstack_project::devstack_launch_slave (
   $jenkins_ssh_public_key,
   $jenkins_ssh_private_key,
   $jenkins_server,
+  $jenkins_credentials_id = '',
 ) {
 
   class { 'openstack_project::slave':
diff --git a/modules/openstack_project/templates/devstack-gate-secure.conf.erb b/modules/openstack_project/templates/devstack-gate-secure.conf.erb
index 09f8b5a0d2..ee824cbfb6 100644
--- a/modules/openstack_project/templates/devstack-gate-secure.conf.erb
+++ b/modules/openstack_project/templates/devstack-gate-secure.conf.erb
@@ -2,3 +2,6 @@
 server=https://<%= jenkins_server %>
 user=<%= jenkins_api_user %>
 apikey=<%= jenkins_api_key %>
+<% if jenkins_credentials_id != "" -%>
+credentials_id=<%= jenkins_credentials_id %>
+<% end -%>