From 543576b9887d308926c5f7661ebc8004bffdc11f Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 5 Jun 2014 14:45:40 +1000
Subject: [PATCH] Add devstack-f20 to hpcloud

Add devstack-f20 to hpcloud using the 'Fedora 20 Server 64-bit
20140407 - Partner Image'.  I have run the devstack preparation
scripts manually and found no problems.

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

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 26f4b19f9a..b0b8536656 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -98,6 +98,11 @@ labels:
       - 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: tripleo-precise
     image: tripleo-precise
     min-ready: 4
@@ -371,6 +376,12 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f20
+        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 30720
@@ -419,6 +430,12 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f20
+        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 30720
@@ -467,6 +484,12 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f20
+        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 30720
@@ -515,6 +538,12 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f20
+        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 30720
@@ -563,6 +592,12 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+      - name: devstack-f20
+        base-image: 'Fedora 20 Server 64-bit 20140407 - Partner Image'
+        min-ram: 30720
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: py3k-precise
         base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
         min-ram: 30720