aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-05-01 12:22:31 -0400
committerDan Prince <dprince@redhat.com>2015-05-01 12:23:40 -0400
commit0ef982864d85890acd061cc4fe31eb9b5320ade5 (patch)
tree52a281342572f8f0dbf7e8595b67345f94ed6f2d /puppet/hieradata
parent9ffe4ebb871d4267ce9f31cad77ee1f2db0080ac (diff)
Revert "Keystone domain for Heat"
This reverts commit 7313930c22b9f18d67e630de084ffcc6fad5ebe7. Seeing errors when trying to create the keystone admin role with packages. (ImportError: No module named os_client_config) Change-Id: I78796598ccb8d2ffd6bfca85dce7d18dc0fd768e Related-bug: #1450786
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/controller.yaml8
1 files changed, 0 insertions, 8 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 421bbdfb..5cf9f350 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -1,8 +1,4 @@
-
# 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
@@ -80,10 +76,6 @@ 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'