Revert "Configures Heat to use Trusts by default"

- This is managed by the puppet-heat module itself,
  (https://review.openstack.org/126940).

This reverts commit 581a79ed85.

Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>

Conflicts:
	packstack/plugins/heat_750.py
	packstack/puppet/templates/heat_trusts.pp
	packstack/puppet/templates/provision_demo.pp
	packstack/puppet/templates/provision_tempest.pp

Change-Id: I61b06f6f2d7de9cbf32061437abef9c5d7860531

packstack/puppet/templates/provision_tempest.pp

@@ -19,9 +19,6 @@ if $provision_tempest_user != '' {
   $admin_password            = hiera('CONFIG_KEYSTONE_ADMIN_PW')
   $admin_tenant_name         = 'admin'
 
-  # Heat Using Trusts
-  $heat_using_trusts         = hiera('CONFIG_HEAT_USING_TRUSTS')
-
   ## Glance
   $image_name                = 'cirros'
   $image_source              = hiera('CONFIG_PROVISION_TEMPEST_CIRROS_URL')
@@ -76,7 +73,7 @@ if $provision_tempest_user != '' {
     password => $password,
   }
 
-  if $heat_using_trusts == 'y' {
+  if hiera('CONFIG_HEAT_INSTALL') == 'y' {
     keystone_user_role { "${username}@${tenant_name}":
       ensure => present,
       roles  => ['_member_', 'heat_stack_owner'],