From cba47056ab67f874b65f374b2d559d65292b9b09 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 11 Dec 2014 09:53:39 +1100
Subject: [PATCH] Bring up Fedora 21 nodes

Bring up Fedora 21 nodes on rackspace and hpcloud.  Although we are
close to being able to build our own images
(Ic6c21f715441a16a1d832163dc71921f25d654df), things aren't quite there
yet.

In the mean time, let's use upstream F21 images for initial testing to
ensure we don't regress while it is being worked on.

I envisage that the existing F20 devstack jobs will disappear quickly
for this once we've got this stable.

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

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index abf27dd8d6..cd7824a865 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -177,6 +177,19 @@ labels:
       - name: hpcloud-b3
       - name: hpcloud-b4
       - name: hpcloud-b5
+  - name: devstack-f21
+    image: devstack-f21
+    ready-script: configure_mirror.sh
+    min-ready: 1
+    providers:
+      - name: rax-dfw
+      - name: rax-ord
+      - name: rax-iad
+      - name: hpcloud-b1
+      - name: hpcloud-b2
+      - name: hpcloud-b3
+      - name: hpcloud-b4
+      - name: hpcloud-b5
   - name: devstack-centos7
     image: devstack-centos7
     ready-script: configure_mirror.sh
@@ -280,6 +293,13 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f21
+        base-image: 'Fedora 21 (PVHVM)'
+        min-ram: 8192
+        name-filter: 'Performance'
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7
         base-image: 'CentOS 7 (PVHVM)'
         min-ram: 8192
@@ -355,6 +375,13 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f21
+        base-image: 'Fedora 21 (PVHVM)'
+        min-ram: 8192
+        name-filter: 'Performance'
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7
         base-image: 'CentOS 7 (PVHVM)'
         min-ram: 8192
@@ -437,6 +464,13 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f21
+        base-image: 'Fedora 21 (PVHVM)'
+        min-ram: 8192
+        name-filter: 'Performance'
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7
         base-image: 'CentOS 7 (PVHVM)'
         min-ram: 8192
@@ -536,6 +570,12 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f21
+        base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7
         base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image'
         min-ram: 30720
@@ -627,6 +667,12 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f21
+        base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7
         base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image'
         min-ram: 30720
@@ -712,6 +758,12 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f21
+        base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7
         base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image'
         min-ram: 30720
@@ -810,6 +862,12 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f21
+        base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7
         base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image'
         min-ram: 30720
@@ -903,6 +961,12 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f21
+        base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7
         base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image'
         min-ram: 30720