@@ -31,6 +31,8 @@ set +o xtrace

 # set up default directories

 HEAT_DIR=$DEST/heat

 HEATCLIENT_DIR=$DEST/python-heatclient

+HEAT_CFNTOOLS_DIR=$DEST/heat-cfntools

+HEAT_TEMPLATES_REPO_DIR=$DEST/heat-templates

 HEAT_AUTH_CACHE_DIR=${HEAT_AUTH_CACHE_DIR:-/var/cache/heat}

 HEAT_STANDALONE=`trueorfalse False $HEAT_STANDALONE`

 HEAT_CONF_DIR=/etc/heat

@@ -179,6 +181,12 @@ function install_heat {

     git_clone $HEAT_REPO $HEAT_DIR $HEAT_BRANCH

 }

+# install_heat_other() - Collect source and prepare

+function install_heat_other {

+    git_clone $HEAT_CFNTOOLS_REPO $HEAT_CFNTOOLS_DIR $HEAT_CFNTOOLS_BRANCH

+    git_clone $HEAT_TEMPLATES_REPO $HEAT_TEMPLATES_REPO_DIR $HEAT_TEMPLATES_BRANCH

+}

+

 # start_heat() - Start running processes, including screen

 function start_heat {

     screen_it h-eng "cd $HEAT_DIR; bin/heat-engine --config-file=$HEAT_CONF"

@@ -812,6 +812,7 @@ fi

 if is_service_enabled heat; then

     install_heat

+    install_heat_other

     cleanup_heat

     configure_heat

 fi

@@ -140,6 +140,14 @@ HEAT_BRANCH=${HEAT_BRANCH:-master}

 HEATCLIENT_REPO=${HEATCLIENT_REPO:-${GIT_BASE}/openstack/python-heatclient.git}

 HEATCLIENT_BRANCH=${HEATCLIENT_BRANCH:-master}

+# heat-cfntools server agent

+HEAT_CFNTOOLS_REPO=${HEAT_CFNTOOLS_REPO:-${GIT_BASE}/openstack/heat-cfntools.git}

+HEAT_CFNTOOLS_BRANCH=${HEAT_CFNTOOLS_BRANCH:-master}

+

+# heat example templates and elements

+HEAT_TEMPLATES_REPO=${HEAT_TEMPLATES_REPO:-${GIT_BASE}/openstack/heat-templates.git}

+HEAT_TEMPLATES_BRANCH=${HEAT_TEMPLATES_BRANCH:-master}

+

 # django powered web control panel for openstack

 HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git}

 HORIZON_BRANCH=${HORIZON_BRANCH:-master}