Merge "Refactor resource dependencies"

manifests/cache.pp

@@ -261,4 +261,8 @@ class ceilometer::cache (
     dead_timeout                         => $dead_timeout,
     manage_backend_package               => $manage_backend_package,
   }
+
+  # all cache settings should be applied and all packages should be installed
+  # before service startup
+  Oslo::Cache['ceilometer_config'] -> Anchor['ceilometer::service::begin']
 }

manifests/coordination.pp

@@ -17,4 +17,8 @@ class ceilometer::coordination (
   oslo::coordination{ 'ceilometer_config':
     backend_url => $backend_url
   }
+
+  # all coordination settings should be applied and all packages should be
+  # installed before service startup
+  Oslo::Coordination['ceilometer_config'] -> Anchor['ceilometer::service::begin']
 }

manifests/deps.pp

@@ -27,14 +27,6 @@ class ceilometer::deps {
   ~> Service<| tag == 'ceilometer-service' |>
   ~> anchor { 'ceilometer::service::end': }
 
-  # all cache settings should be applied and all packages should be installed
-  # before service startup
-  Oslo::Cache<||> -> Anchor['ceilometer::service::begin']
-
-  # all coordination settings should be applied and all packages should be
-  # installed before service startup
-  Oslo::Coordination<||> -> Anchor['ceilometer::service::begin']
-
   # rootwrap config should occur in the config block also.
   Anchor['ceilometer::config::begin']
   -> Ceilometer_rootwrap_config<||>