summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorMartin Mágr <mmagr@redhat.com>2015-03-02 11:04:20 +0100
committerMartin Mágr <mmagr@redhat.com>2015-04-22 12:37:23 +0200
commit7313930c22b9f18d67e630de084ffcc6fad5ebe7 (patch)
treeec2f19845f591d17e7835285750b7b7d6fc3bd48 /puppet/manifests
parent0c14b2ad3e0114ffa0aa9514cdfe3dd9d9d212a8 (diff)
Keystone domain for Heat
This patch adds support for configuring Keystone domain for Heat via heat-keystone-setup-domain script. It should be reverted as soon as Keystone v3 is fully functional. Change-Id: I7397f49fac17c30262d02b70021d613aef5c6cad
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 2b637b37..5a63456c 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -152,6 +152,7 @@ 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 {
@@ -339,6 +340,9 @@ 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: