openstack
/
puppet-ceilometer
Code Issues Proposed changes

auth: drop service dependency for Keystone_user_role 

Drop service dependency for Keystone_user_role.

Without that patch, Ceilometer & Keystone running in WSGI will fail to compile
the catalog because a dependency cycle:
Anchor[keystone_started] => Keystone_user_role[ceilometer@services] =>
Service[ceilometer-api] => Service[httpd] => Anchor[keystone_started]

The dependency is not really useful because it does not prevent the
service to start.

Change-Id: Id8366cd5d2ddf6da468ecc7adb7d55eb8be4c8d8
This commit is contained in:
Emilien Macchi 2015-10-02 16:17:25 -04:00
parent 919020ed4c
commit 183b62b35a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/keystone/auth.pp
View File

@ -204,8 +204,7 @@ class ceilometer::keystone::auth (
ensure => present,
}
}
Keystone_role['ResellerAdmin'] -> Keystone_user_role["${auth_name}@${tenant}"] ~>
Service <| name == 'ceilometer-api' |>
Keystone_role['ResellerAdmin'] -> Keystone_user_role["${auth_name}@${tenant}"]
}
}