| commit | 9528ffd4bf0152a45ad772798b9c6365167da825 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri Jun 07 00:54:13 2013 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri Jun 07 00:54:13 2013 +0000 |
| tree | e68f7576a29a5d046758e5786a619edf4a46809d | |
| parent | 3df12bb22b63330fedb44816ef9dca4425435572 [diff] | |
| parent | 26824b054623dfda64ffe9617bcf5df835c7c433 [diff] |
Merge "Run heat tempest tests if heat is enabled in devstack."
diff --git a/lib/tempest b/lib/tempest index e59737b..a259ee9 100644 --- a/lib/tempest +++ b/lib/tempest
@@ -255,6 +255,11 @@ iniset $TEMPEST_CONF boto http_socket_timeout 30 iniset $TEMPEST_CONF boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros} + # orchestration + if is_service_enabled heat; then + iniset $TEMPEST_CONF orchestration heat_available "True" + fi + echo "Created tempest configuration file:" cat $TEMPEST_CONF