From 9e60e4e744aba3aabb9514647154cd06e59956cb Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 11 Dec 2014 13:24:22 +1100
Subject: [PATCH] Add Fedora 21 image build to nodepool

Add released Fedora 21 image build to nodepool build.  This is an
update of Ic6c21f715441a16a1d832163dc71921f25d654df

Note nodepool needs the fix below before it will work with this

Depends-on: I0ea4dc54edad7ef9b5d4ad59922f762ed8bbcd89

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

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 810859818f..caa11f4e85 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -188,6 +188,16 @@ labels:
       - name: hpcloud-b3
       - name: hpcloud-b4
       - name: hpcloud-b5
+  - name: devstack-fedora21-dib
+    image: devstack-fedora21-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: tripleo-precise
     image: tripleo-precise
     min-ready: 8
@@ -513,6 +523,12 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-fedora21-dib
+        min-ram: 30720
+        diskimage: devstack-fedora21-dib
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+
   - name: hpcloud-b2
     region-name: 'region-b.geo-1'
     service-type: 'compute'
@@ -597,6 +613,11 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-fedora21-dib
+        min-ram: 30720
+        diskimage: devstack-fedora21-dib
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
   - name: hpcloud-b3
     region-name: 'region-b.geo-1'
     service-type: 'compute'
@@ -681,6 +702,11 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-fedora21-dib
+        min-ram: 30720
+        diskimage: devstack-fedora21-dib
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
   - name: hpcloud-b4
     region-name: 'region-b.geo-1'
     service-type: 'compute'
@@ -766,6 +792,11 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-fedora21-dib
+        min-ram: 30720
+        diskimage: devstack-fedora21-dib
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
   - name: hpcloud-b5
     region-name: 'region-b.geo-1'
     service-type: 'compute'
@@ -852,6 +883,11 @@ providers:
         diskimage: devstack-centos7-dib
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-fedora21-dib
+        min-ram: 30720
+        diskimage: devstack-fedora21-dib
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
   - name: tripleo-test-cloud-hp1
     service-type: 'compute'
     service-name: 'nova'
@@ -1018,3 +1054,17 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_IMAGE_CACHE: /opt/dib_cache
       QEMU_IMG_OPTIONS: compat=0.10
+ - name: devstack-fedora21-dib
+   elements:
+      - fedora
+      - vm
+      - puppet
+      - nodepool-base
+      - node-devstack
+   release: 21
+   env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_CLOUD_IMAGES: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2
+      BASE_IMAGE_FILE: Fedora-Cloud-Base-20141203-21.x86_64.qcow2
+      QEMU_IMG_OPTIONS: compat=0.10
\ No newline at end of file