Revert "Temp revert of heat commit"

This reverts commit 0227e314da.

This commit isn't the problem, it just unmasks the symptoms.

Change-Id: I80913559b13222de7cab10df157605bf82ef5fc3
This commit is contained in:
lifeless 2014-05-16 14:46:50 +00:00
parent 0227e314da
commit 4146d34e58
1 changed files with 0 additions and 7 deletions

View File

@ -7,13 +7,6 @@ if [ ! -e "$TE_DATAFILE" ] ; then
exit 1
fi
# temp revert of https://review.openstack.org/#/c/92033/
pushd /opt/stack/new/heat
git revert --no-edit f8b15273a25ea665b600a4a8a468245d6a42282f || true
git reset --hard HEAD # Do this incase the revert fails (hopefully because its not needed)
popd
export PATH=/sbin:/usr/sbin:$PATH
PRIV_SSH_KEY=$(OS_CONFIG_FILES=$TE_DATAFILE os-apply-config --key ssh-key --type raw)