From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 30 Apr 2015 14:09:58 +0000 (+0000)
Subject: Merge "Keystone domain for Heat"
X-Git-Tag: opnfv-6.0.0~2597
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9ffe4ebb871d4267ce9f31cad77ee1f2db0080ac;p=apex-tripleo-heat-templates.git

Merge "Keystone domain for Heat"
---

9ffe4ebb871d4267ce9f31cad77ee1f2db0080ac
diff --cc puppet/hieradata/controller.yaml
index 5cf9f350,1a74e0a8..421bbdfb
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@@ -76,11 -73,11 +80,15 @@@ cinder::scheduler::scheduler_driver: ci
  heat::engine::heat_stack_user_role: ''
  heat::engine::configure_delegated_roles: false
  heat::engine::trusts_delegated_roles: []
+ heat::keystone::domain::keystone_admin: 'admin'
+ heat::keystone::domain::keystone_tenant: 'admin'
+ heat::keystone::domain::domain_name: 'heat_stack'
+ heat::keystone::domain::domain_admin: 'heat_stack_domain_admin'
  
 +# pacemaker
 +pacemaker::corosync::cluster_name: 'tripleo_cluster'
 +pacemaker::corosync::manage_fw: false
 +
  mysql::server::manage_config_file: true
  
  tripleo::loadbalancer::keystone_admin: true