From ae08799c45d2e8fd454c58804550e69e25bef49b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 22 Sep 2014 13:38:01 -0700
Subject: [PATCH] Add devstack-trusty-dib image.

Add a new devstack trusty image to nodepool that is built via dib on the
nodepool server. This is our first test of the new dib features added to
nodepool. Once we have these images in glance and are able to boot nodes
off of them we can add new tests that check their behavior.

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

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index e21c44977a..fa13a9ee6a 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -65,6 +65,16 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
+  - name: devstack-trusty-dib
+    image: devstack-trusty-dib
+    ready-script: configure_mirror.sh
+    min-ready: 1
+    providers:
+      - name: hpcloud-b1
+      - name: hpcloud-b2
+      - name: hpcloud-b3
+      - name: hpcloud-b4
+      - name: hpcloud-b5
   - name: bare-trusty
     image: bare-trusty
     ready-script: configure_mirror.sh
@@ -496,6 +506,9 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-trusty-dib
+        min-ram: 30720
+        diskimage: devstack-trusty-dib
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
@@ -566,6 +579,9 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-trusty-dib
+        min-ram: 30720
+        diskimage: devstack-trusty-dib
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
@@ -636,6 +652,9 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-trusty-dib
+        min-ram: 30720
+        diskimage: devstack-trusty-dib
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
@@ -707,6 +726,9 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-trusty-dib
+        min-ram: 30720
+        diskimage: devstack-trusty-dib
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
@@ -779,6 +801,9 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-trusty-dib
+        min-ram: 30720
+        diskimage: devstack-trusty-dib
       - name: bare-trusty
         base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
@@ -909,3 +934,14 @@ targets:
       user: '<%= jenkins_api_user %>'
       apikey: '<%= jenkins_api_key %>'
       credentials-id: '<%= jenkins_credentials_id %>'
+
+diskimages:
+  - name: devstack-trusty-dib
+    elements:
+      - ubuntu
+      - vm
+      - openstack-repos
+      - puppet
+      - nodepool-base
+      - node-devstack
+    release: trusty