From 183b62b35a32390285c454cc35dbfc7721150944 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 2 Oct 2015 16:17:25 -0400 Subject: [PATCH] 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 --- manifests/keystone/auth.pp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index e3211b35..a4a19044 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -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}"] } }