openstack
/
puppet-tripleo
Code Issues Proposed changes

tuning: manage keystone resources only at step3 

1. Manage Keystone resources only at step 3. Don't verify them
   at step 4 and 5, it's a huge loss of time.
2. Don't require Keystone resources for Gnocchi services, they are
   already ready at Step 5.

Related-Bug: #1664418
Change-Id: I9879718a1a86b862e5eb97e6f938533c96c9f5c8
This commit is contained in:
Emilien Macchi 2017-02-14 17:17:39 -05:00
parent dfc498f2ad
commit d545621e61
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/gnocchi/metricd.pp
View File

@ -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']
}
}

2
manifests/profile/base/gnocchi/statsd.pp
View File

@ -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']
}
}

18
manifests/profile/base/keystone.pp
View File

@ -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
}