Merge "Keystone domain for Heat"

diff --cc overcloud-without-mergepy.yaml
Simple merge

diff --cc puppet/controller-puppet.yaml
Simple merge

diff --cc puppet/hieradata/controller.yaml
index 5cf9f35,1a74e0a..421bbdf
--- 1/puppet/hieradata/controller.yaml
--- 2/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

diff --cc puppet/manifests/overcloud_controller.pp
Simple merge