Merge "Install heat-cfntools from pypi"

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

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

elements/heat-jeos/install.d/05-heat-jeos

@@ -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'

elements/os-refresh-config/element-deps

@@ -1,2 +1,2 @@
-heat-jeos
+heat-cfntools
 os-config-applier