summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-30 14:09:58 +0000
committerGerrit Code Review <review@openstack.org>2015-04-30 14:09:58 +0000
commit9ffe4ebb871d4267ce9f31cad77ee1f2db0080ac (patch)
treecad16224b4daae01964ef75a1e153a00b3d7c5b9 /puppet/hieradata
parent8d09036e0c2d39e79c279491e887083a365fd1ea (diff)
parent7313930c22b9f18d67e630de084ffcc6fad5ebe7 (diff)
Merge "Keystone domain for Heat"
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/controller.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 5cf9f350..421bbdfb 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -1,4 +1,8 @@
+
# Hiera data here applies to all controller nodes
+keystone::roles::admin::email: 'root@localhost'
+keystone::roles::admin::admin_tenant: 'admin'
+
nova::api::enabled: true
nova::conductor::enabled: true
nova::consoleauth::enabled: true
@@ -76,6 +80,10 @@ cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterSch
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'