From 59fc53a66c4dec45e4d150bce0a1d674477f710c Mon Sep 17 00:00:00 2001
From: Thomas Herve <therve@redhat.com>
Date: Tue, 12 Jul 2016 11:48:47 +0200
Subject: [PATCH] Use Fedora 24 base image

Use the standard base image for now, it's smaller and we don't need the
full custom image.

Change-Id: Ifaccf340f0ff4eac52b1eeef5914b7e90f2687da
---
 heat/cloudinit/loguserdata.py             | 10 +++++++++-
 heat_integrationtests/prepare_test_env.sh |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/heat/cloudinit/loguserdata.py b/heat/cloudinit/loguserdata.py
index 0e36d23a2..7d0dbae46 100755
--- a/heat/cloudinit/loguserdata.py
+++ b/heat/cloudinit/loguserdata.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/bash
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -11,6 +11,14 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+"true" '''\'
+if hash python3 2>/dev/null; then
+    interpreter="python3"
+else
+    interpreter="python"
+fi
+exec $interpreter "$0"
+'''
 
 import datetime
 from distutils import version
diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index 02f46ea47..827d34a8f 100755
--- a/heat_integrationtests/prepare_test_env.sh
+++ b/heat_integrationtests/prepare_test_env.sh
@@ -31,7 +31,7 @@ openstack flavor create m1.heat_int --ram 512
 openstack flavor create m1.heat_micro --ram 128
 
 # Register the glance image for testing
-curl http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2 | openstack image create fedora-heat-test-image --disk-format qcow2 --container-format bare --public
+curl -L https://download.fedoraproject.org/pub/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.qcow2 | openstack image create fedora-heat-test-image --disk-format qcow2 --container-format bare --public
 if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
    # The curl command failed, so the upload is mostly likely incorrect. Let's
    # bail out early.