From 031efcad21d97558def77e2d8cb1a370dbdae0e6 Mon Sep 17 00:00:00 2001
From: K Jonathan Harker <k.jonathan.harker@hp.com>
Date: Wed, 8 Jul 2015 14:57:38 -0700
Subject: [PATCH] Remove jenkins & nodepool creds from nodepool.yaml

Now that we are putting the sensitive jenkins and nodepool database
credentials in the new secure.conf file, let's remove the sensitive
information from nodepool.yaml.

Depends-On: Ifa4d500c52974b9fd3a0b7fd9c28cf8f52899ca9
Change-Id: Ib045c104daac15360e62f46e3e5683c7a387bc96
---
 manifests/site.pp                             |  3 --
 .../manifests/nodepool_prod.pp                |  3 --
 .../templates/nodepool/nodepool.yaml.erb      | 36 -------------------
 3 files changed, 42 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index c68968ed77..1a88a292a6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -619,9 +619,6 @@ node 'nodepool.openstack.org' {
     mysql_root_password      => hiera('nodepool_mysql_root_password', 'XXX'),
     nodepool_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'),
     statsd_host              => 'graphite.openstack.org',
-    jenkins_api_user         => hiera('jenkins_api_user', 'username'),
-    jenkins_api_key          => hiera('jenkins_api_key', 'XXX'),
-    jenkins_credentials_id   => hiera('jenkins_credentials_id', 'XXX'),
     jenkins_masters          => [
       {
         name        => 'jenkins01',
diff --git a/modules/openstack_project/manifests/nodepool_prod.pp b/modules/openstack_project/manifests/nodepool_prod.pp
index da01332039..8a76aecab0 100644
--- a/modules/openstack_project/manifests/nodepool_prod.pp
+++ b/modules/openstack_project/manifests/nodepool_prod.pp
@@ -8,9 +8,6 @@ class openstack_project::nodepool_prod(
   $nodepool_logging_template = 'openstack_project/nodepool/nodepool.logging.conf.erb',
   $vhost_name = 'nodepool.openstack.org',
   $statsd_host = '',
-  $jenkins_api_user ='',
-  $jenkins_api_key ='',
-  $jenkins_credentials_id ='',
   $jenkins_masters = [],
   $rackspace_username ='',
   $rackspace_password ='',
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index b6ea466586..d182f3f9e0 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -1,7 +1,6 @@
 script-dir: /etc/nodepool/scripts
 elements-dir: /etc/nodepool/elements
 images-dir: /opt/nodepool_dib
-dburi: 'mysql+pymysql://nodepool:<%= mysql_password %>@localhost/nodepool'
 
 cron:
   cleanup: '*/1 * * * *'
@@ -1024,47 +1023,12 @@ providers:
         private-key: /home/nodepool/.ssh/id_rsa
 targets:
   - name: jenkins01
-    jenkins:
-      url: 'https://jenkins01.openstack.org/'
-      user: '<%= jenkins_api_user %>'
-      apikey: '<%= jenkins_api_key %>'
-      credentials-id: '<%= jenkins_credentials_id %>'
   - name: jenkins02
-    jenkins:
-      url: 'https://jenkins02.openstack.org/'
-      user: '<%= jenkins_api_user %>'
-      apikey: '<%= jenkins_api_key %>'
-      credentials-id: '<%= jenkins_credentials_id %>'
   - name: jenkins03
-    jenkins:
-      url: 'https://jenkins03.openstack.org/'
-      user: '<%= jenkins_api_user %>'
-      apikey: '<%= jenkins_api_key %>'
-      credentials-id: '<%= jenkins_credentials_id %>'
   - name: jenkins04
-    jenkins:
-      url: 'https://jenkins04.openstack.org/'
-      user: '<%= jenkins_api_user %>'
-      apikey: '<%= jenkins_api_key %>'
-      credentials-id: '<%= jenkins_credentials_id %>'
   - name: jenkins05
-    jenkins:
-      url: 'https://jenkins05.openstack.org/'
-      user: '<%= jenkins_api_user %>'
-      apikey: '<%= jenkins_api_key %>'
-      credentials-id: '<%= jenkins_credentials_id %>'
   - name: jenkins06
-    jenkins:
-      url: 'https://jenkins06.openstack.org/'
-      user: '<%= jenkins_api_user %>'
-      apikey: '<%= jenkins_api_key %>'
-      credentials-id: '<%= jenkins_credentials_id %>'
   - name: jenkins07
-    jenkins:
-      url: 'https://jenkins07.openstack.org/'
-      user: '<%= jenkins_api_user %>'
-      apikey: '<%= jenkins_api_key %>'
-      credentials-id: '<%= jenkins_credentials_id %>'
 
 diskimages:
   - name: centos-6