From ecc0240b5cd0e4621828dc17ed8d73d78746fc29 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 23 Sep 2014 15:51:21 -0700
Subject: [PATCH] Set the nodepool user and key on dib images

We need to set the nodepool user and key on dib images so that dib can
run the pre use check script on the nodes (without these values nodepool
uses invalid defaults). Logically this appears to be part of the image
building process but the post slave boot check scripts need it too.

Change-Id: I51c7da1d58c2550903ad1671dcfb477b06424cfd
---
 .../templates/nodepool/nodepool.yaml.erb               | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index fa13a9ee6a..115b0ad67d 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -509,6 +509,8 @@ providers:
       - name: devstack-trusty-dib
         min-ram: 30720
         diskimage: devstack-trusty-dib
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
@@ -582,6 +584,8 @@ providers:
       - name: devstack-trusty-dib
         min-ram: 30720
         diskimage: devstack-trusty-dib
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
@@ -655,6 +659,8 @@ providers:
       - name: devstack-trusty-dib
         min-ram: 30720
         diskimage: devstack-trusty-dib
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
@@ -729,6 +735,8 @@ providers:
       - name: devstack-trusty-dib
         min-ram: 30720
         diskimage: devstack-trusty-dib
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
@@ -804,6 +812,8 @@ providers:
       - name: devstack-trusty-dib
         min-ram: 30720
         diskimage: devstack-trusty-dib
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720