From 0ef982864d85890acd061cc4fe31eb9b5320ade5 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 1 May 2015 12:22:31 -0400 Subject: 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 --- puppet/hieradata/controller.yaml | 8 -------- 1 file changed, 8 deletions(-) (limited to 'puppet/hieradata') 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' -- cgit 1.2.3-korg