From d5b3583d39f62b007c5259b6029c342db6962875 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 15 Oct 2014 13:42:40 +1100
Subject: [PATCH] Add HP Cloud Centos7 images

Add HP Cloud Centos7 to nodepool.  This is considered an interim
solution while we work on diskimage-builder based images.

Tested with prepare_node_devstack.sh

Change-Id: Ibff757c62b64dfe18d66dd7b15fd7cf48ecc502d
---
 .../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 b21dcb61d6..674ed82d7f 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -193,6 +193,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: devstack-centos7-dib
     image: devstack-centos7-dib
     ready-script: configure_mirror.sh
@@ -559,6 +564,12 @@ providers:
         setup: prepare_node_bare.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
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7-dib
         min-ram: 30720
         diskimage: devstack-centos7-dib
@@ -643,6 +654,12 @@ providers:
         setup: prepare_node_bare.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
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7-dib
         min-ram: 30720
         diskimage: devstack-centos7-dib
@@ -721,6 +738,12 @@ providers:
         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
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7-dib
         min-ram: 30720
         diskimage: devstack-centos7-dib
@@ -812,6 +835,12 @@ providers:
         setup: prepare_node_bare.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
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7-dib
         min-ram: 30720
         diskimage: devstack-centos7-dib
@@ -898,6 +927,12 @@ providers:
         setup: prepare_node_bare.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
+        setup: prepare_node_devstack.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-centos7-dib
         min-ram: 30720
         diskimage: devstack-centos7-dib