From d85f3c004b06a0e7c16eaad1fe7a1dcac45085d9 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 1 Aug 2014 16:40:52 -0700
Subject: [PATCH] Use a current Trusty image name in hpcloud

HPCloud "deprecates" images and renames them. This appears to also
change the image uuid in the process. I have checked the image uuid
against
https://cloud-images.ubuntu.com/releases/streams/v1/com.ubuntu.cloud:released:hpcloud.json
and according to that file's gpg signature the uuid is correct.
Note I don't have a chain of trust to the signature used so can only
verify the signature not the signer. I also looked for checksums in
the signed json file but they don't seem to exist so I can only check
the uuid.

Go with the new 14.04.1 image which is current and not deprecated. We
problably want to confirm with ubuntu before we merge this change
though.

Change-Id: I979f1b90fa5dd4e5889b58539208303b78feb115
---
 .../templates/nodepool/nodepool.yaml.erb      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 015de1b895..2ed22e1b25 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -433,13 +433,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty
-        base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image'
+        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
-        base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image'
+        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
         setup: prepare_node_bare.sh
         username: jenkins
@@ -499,13 +499,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty
-        base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image'
+        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
-        base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image'
+        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
         setup: prepare_node_bare.sh
         username: jenkins
@@ -565,13 +565,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty
-        base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image'
+        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
-        base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image'
+        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
         setup: prepare_node_bare.sh
         username: jenkins
@@ -631,13 +631,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty
-        base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image'
+        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
-        base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image'
+        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
         setup: prepare_node_bare.sh
         username: jenkins
@@ -697,13 +697,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-trusty
-        base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image'
+        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
       - name: bare-trusty
-        base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image'
+        base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20140724) - Partner Image'
         min-ram: 30720
         setup: prepare_node_bare.sh
         username: jenkins