diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-02-16 01:11:42 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-02-16 01:11:42 +0000 |
commit | 9ad8e263f7c6ef5304b4e8229e93c1d8add38596 (patch) | |
tree | 7d4c06d3311609f642e0f81362e1602dbbdd59ce /manifests | |
parent | aafff78c8770a36bf97c6f6193a6f7b58665b179 (diff) | |
parent | d545621e613f867ef84ba073588da79943f3bb61 (diff) |
Merge "tuning: manage keystone resources only at step3"
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/profile/base/gnocchi/metricd.pp | 2 | ||||
-rw-r--r-- | manifests/profile/base/gnocchi/statsd.pp | 2 | ||||
-rw-r--r-- | manifests/profile/base/keystone.pp | 18 |
3 files changed, 7 insertions, 15 deletions
diff --git a/manifests/profile/base/gnocchi/metricd.pp b/manifests/profile/base/gnocchi/metricd.pp index e69bbd5..f6f80cd 100644 --- a/manifests/profile/base/gnocchi/metricd.pp +++ b/manifests/profile/base/gnocchi/metricd.pp @@ -30,7 +30,5 @@ class tripleo::profile::base::gnocchi::metricd ( if $step >= 5 { include ::gnocchi::metricd - Keystone_endpoint<||> -> Service['gnocchi-metricd'] - Keystone_user_role<||> -> Service['gnocchi-metricd'] } } diff --git a/manifests/profile/base/gnocchi/statsd.pp b/manifests/profile/base/gnocchi/statsd.pp index 1fe4067..7c98a0a 100644 --- a/manifests/profile/base/gnocchi/statsd.pp +++ b/manifests/profile/base/gnocchi/statsd.pp @@ -30,7 +30,5 @@ class tripleo::profile::base::gnocchi::statsd ( if $step >= 5 { include ::gnocchi::statsd - Keystone_endpoint<||> -> Service['gnocchi-statsd'] - Keystone_user_role<||> -> Service['gnocchi-statsd'] } } diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index 3ff8e63..999bcf6 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -157,22 +157,13 @@ class tripleo::profile::base::keystone ( ssl_key_admin => $tls_keyfile_admin, } include ::keystone::cors - - if $manage_roles { - include ::keystone::roles::admin - } - - if $manage_endpoint { - include ::keystone::endpoint - } - } if $step >= 4 and $manage_db_purge { include ::keystone::cron::token_flush } - if $step >= 3 and $manage_domain { + if $step == 3 and $manage_domain { if hiera('heat_engine_enabled', false) { # create these seperate and don't use ::heat::keystone::domain since # that class writes out the configs @@ -193,7 +184,12 @@ class tripleo::profile::base::keystone ( } } - if $step >= 3 and $manage_endpoint{ + if $step == 3 and $manage_roles { + include ::keystone::roles::admin + } + + if $step == 3 and $manage_endpoint { + include ::keystone::endpoint if hiera('aodh_api_enabled', false) { include ::aodh::keystone::auth } |