diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-04-30 14:09:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-04-30 14:09:58 +0000 |
| commit | 9ffe4ebb871d4267ce9f31cad77ee1f2db0080ac (patch) | |
| tree | cad16224b4daae01964ef75a1e153a00b3d7c5b9 /puppet/manifests | |
| parent | 8d09036e0c2d39e79c279491e887083a365fd1ea (diff) | |
| parent | 7313930c22b9f18d67e630de084ffcc6fad5ebe7 (diff) | |
Merge "Keystone domain for Heat"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 6e8bf5a7..9f385a1d 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -260,6 +260,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 { @@ -461,6 +462,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: |