From 9f761ca0fc7d0897e1da4e3c192695ca28b2b85a Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Tue, 22 Sep 2015 14:36:12 +0100
Subject: [PATCH] Allow tempest to deploy when no heat in environment

Currently, the deployment of tempest will fail if heat does not exist
in the environment.  This commit updates
os_tempest/tasks/tempest_resources.yml so that users are only added
to heat_stack_owner role if tempest_service_available_heat is set to
True.

Change-Id: Ib3f6a11de60be86c1b2581d3c8da615d66ebae5b
---
 playbooks/roles/os_tempest/tasks/tempest_resources.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/playbooks/roles/os_tempest/tasks/tempest_resources.yml b/playbooks/roles/os_tempest/tasks/tempest_resources.yml
index fdd78a51a4..5db971bc51 100644
--- a/playbooks/roles/os_tempest/tasks/tempest_resources.yml
+++ b/playbooks/roles/os_tempest/tasks/tempest_resources.yml
@@ -72,7 +72,7 @@
   tags:
     - tempest-setup
 
-- name: Ensure tempest users have heat_stack_owners role
+- name: Ensure tempest users have heat_stack_owner role
   keystone:
     command: ensure_user_role
     token: "{{ keystone_auth_admin_token }}"
@@ -85,6 +85,7 @@
   until: add_service|success
   retries: 5
   delay: 10
+  when: tempest_service_available_heat | bool
   with_items:
     - demo
     - alt_demo