From 835b45100ad4579f19338ea710a5c0c284ff3f6b Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 9 Jan 2014 01:13:34 +0000
Subject: [PATCH] Move credentials over to private

---
 files/jenkins/master/credentials.xml | 25 -------------------------
 playbooks/groups/jenkins-cloud.yml   |  5 +++++
 2 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 files/jenkins/master/credentials.xml

diff --git a/files/jenkins/master/credentials.xml b/files/jenkins/master/credentials.xml
deleted file mode 100644
index d28a49bd83..0000000000
--- a/files/jenkins/master/credentials.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin="credentials@1.4">
-  <credentials>
-    <com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey plugin="ssh-credentials@0.3">
-      <scope>SYSTEM</scope>
-      <id>d844d352-af1d-466b-9fc9-cbb19348103a</id>
-      <description>172.16.5.12</description>
-      <username>jenkins_slave</username>
-      <passphrase>bEcypl4niEJMODrtoQ7iCw==</passphrase>
-      <privateKeySource class="com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey$FileOnMasterPrivateKeySource">
-        <privateKeyFile>/var/tmp/jenkins_master_id_rsa</privateKeyFile>
-      </privateKeySource>
-    </com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey>
-    <com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey plugin="ssh-credentials@0.3">
-      <scope>SYSTEM</scope>
-      <id>950d5dd7-acb2-402a-8670-21f152d04928</id>
-      <description>172.16.5.10</description>
-      <username>jenkins_slave</username>
-      <passphrase>bEcypl4niEJMODrtoQ7iCw==</passphrase>
-      <privateKeySource class="com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey$FileOnMasterPrivateKeySource">
-        <privateKeyFile>/var/tmp/jenkins_master_id_rsa</privateKeyFile>
-      </privateKeySource>
-    </com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey>
-  </credentials>
-</com.cloudbees.plugins.credentials.SystemCredentialsProvider>
diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml
index 2a70881f03..595b9aa481 100644
--- a/playbooks/groups/jenkins-cloud.yml
+++ b/playbooks/groups/jenkins-cloud.yml
@@ -119,6 +119,11 @@
     tags:
     - config
 
+  - name: add jenkins credentials it can connect to clients
+    action: copy src="{{ private }}/files/jenkins/ssh/credentials.xml" dest=/var/lib/jenkins/
+    tags:
+    - config
+
   - name: start jenkins itself
     action: service name=jenkins state=running