diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-05-01 12:22:31 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-05-01 12:23:40 -0400 |
| commit | 0ef982864d85890acd061cc4fe31eb9b5320ade5 (patch) | |
| tree | 52a281342572f8f0dbf7e8595b67345f94ed6f2d /puppet/manifests/overcloud_controller.pp | |
| parent | 9ffe4ebb871d4267ce9f31cad77ee1f2db0080ac (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/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 9f385a1d..6e8bf5a7 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -260,7 +260,6 @@ if hiera('step') >= 2 { if hiera('step') >= 3 { include ::keystone - include ::keystone::roles::admin #TODO: need a cleanup-keystone-tokens.sh solution here keystone_config { @@ -462,9 +461,6 @@ if hiera('step') >= 3 { include ::heat::api_cfn include ::heat::api_cloudwatch include ::heat::engine - # TO-DO: Remove this class as soon as Keystone v3 will be fully functional - include ::heat::keystone::domain - Service['keystone'] -> Class['::keystone::roles::admin'] -> Exec['heat_domain_create'] $snmpd_user = hiera('snmpd_readonly_user_name') snmp::snmpv3_user { $snmpd_user: |