]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
auth: drop service dependency for Keystone_user_role
authorEmilien Macchi <emilien@redhat.com>
Fri, 2 Oct 2015 20:17:25 +0000 (16:17 -0400)
committerEmilien Macchi <emilien@redhat.com>
Fri, 2 Oct 2015 20:17:25 +0000 (16:17 -0400)
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

index e3211b3599654ea122beb9fe7201f1aa7df9f360..a4a19044f24ba74f93f0740c3d944eeabfdbce5e 100644 (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}"]
   }
 
 }