From bdc575974091ced865dfd84a4c195a179cb3034b Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Thu, 21 Feb 2013 15:47:12 +1300
Subject: [PATCH] Install heat-cfntools from pypi

Then creates symlinks into /opt/aws/bin using the included script.

This replaces the heat-jeos element, so anything that references heat-jeos will need to be replaced with heat-cfntools

Change-Id: Id286b005f69ea364357303b4bbc1ed29d4f0f8f9
---
 .../{heat-jeos => heat-cfntools}/README.md    |  2 +-
 .../heat-cfntools/install.d/05-heat-cfntools  | 11 +++++++++
 .../install.d/10-ec2-user                     |  0
 elements/heat-jeos/install.d/05-heat-jeos     | 24 -------------------
 elements/os-refresh-config/element-deps       |  2 +-
 5 files changed, 13 insertions(+), 26 deletions(-)
 rename elements/{heat-jeos => heat-cfntools}/README.md (58%)
 create mode 100755 elements/heat-cfntools/install.d/05-heat-cfntools
 rename elements/{heat-jeos => heat-cfntools}/install.d/10-ec2-user (100%)
 delete mode 100755 elements/heat-jeos/install.d/05-heat-jeos

diff --git a/elements/heat-jeos/README.md b/elements/heat-cfntools/README.md
similarity index 58%
rename from elements/heat-jeos/README.md
rename to elements/heat-cfntools/README.md
index d8c3142d..b9ebdd9e 100644
--- a/elements/heat-jeos/README.md
+++ b/elements/heat-cfntools/README.md
@@ -1,3 +1,3 @@
-Install the Heat JEOS "cfn" (for CloudFormation) tools to enable HEAT
+Install the Heat cfntools (for CloudFormation) to enable HEAT
 templates to make use of advanced features of HEAT such as watches and
 AWS::CloudFormation::Init
diff --git a/elements/heat-cfntools/install.d/05-heat-cfntools b/elements/heat-cfntools/install.d/05-heat-cfntools
new file mode 100755
index 00000000..f2cb2b0f
--- /dev/null
+++ b/elements/heat-cfntools/install.d/05-heat-cfntools
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -uex
+
+install-packages \
+    python-pip python-psutil
+
+# Boto in Ubuntu 12.10 is too old. Newer boto's aren't
+# supported by heat-api-cfn. Bug ref: http://pad.lv/1122472
+pip install 'boto==2.5.2' heat-cfntools
+cfn-create-aws-symlinks --source /usr/local/bin
diff --git a/elements/heat-jeos/install.d/10-ec2-user b/elements/heat-cfntools/install.d/10-ec2-user
similarity index 100%
rename from elements/heat-jeos/install.d/10-ec2-user
rename to elements/heat-cfntools/install.d/10-ec2-user
diff --git a/elements/heat-jeos/install.d/05-heat-jeos b/elements/heat-jeos/install.d/05-heat-jeos
deleted file mode 100755
index d5736d81..00000000
--- a/elements/heat-jeos/install.d/05-heat-jeos
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -uex
-
-CFN_TOOLS_ROOT=/opt/aws/bin # Heat hard codes this
-
-HEAT_API_SOURCE=https://github.com/heat-api/heat-jeos.git
-
-OS_ROOT=/opt/stack
-JEOS_ROOT=$OS_ROOT/heat-jeos
-
-install-packages git-core python-psutil python-pip
-
-mkdir -p $OS_ROOT
-git clone $HEAT_API_SOURCE $JEOS_ROOT
-cd $JEOS_ROOT
-git checkout master
-
-mkdir -p $CFN_TOOLS_ROOT
-ln -sf $JEOS_ROOT/heat_jeos/cfntools/* $CFN_TOOLS_ROOT
-
-# Boto in Ubuntu 12.10 is too old. Newer boto's aren't
-# supported by heat-api-cfn. Bug ref: http://pad.lv/1122472
-pip install 'boto==2.5.2'
diff --git a/elements/os-refresh-config/element-deps b/elements/os-refresh-config/element-deps
index c4ebd9c8..5aee3bbb 100644
--- a/elements/os-refresh-config/element-deps
+++ b/elements/os-refresh-config/element-deps
@@ -1,2 +1,2 @@
-heat-jeos
+heat-cfntools
 os-config-applier