Merge "Refactor resource dependencies"

manifests/cache.pp

@@ -275,4 +275,7 @@ class keystone::cache(
     manage_backend_package               => $manage_backend_package,
   }
 
+  # all cache settings should be applied and all packages should be installed
+  # before service startup
+  Oslo::Cache['keystone_config'] -> Anchor['keystone::service::begin']
 }

manifests/db.pp

@@ -69,4 +69,7 @@ class keystone::db (
     mysql_enable_ndb        => $mysql_enable_ndb,
   }
 
+  # all db settings should be applied and all packages should be installed
+  # before dbsync starts
+  Oslo::Db['keystone_config'] -> Anchor['keystone::dbsync::begin']
 }

manifests/deps.pp

@@ -24,22 +24,8 @@ class keystone::deps {
   ~> Service<| tag == 'keystone-service' |>
   ~> anchor { 'keystone::service::end': }
 
-  # On any uwsgi config change, we must restart Keystone.
   Anchor['keystone::config::begin']
   -> Keystone_uwsgi_config<||>
-  ~> Anchor['keystone::config::end']
-
-  # all cache settings should be applied and all packages should be installed
-  # before service startup
-  Oslo::Cache<||> -> Anchor['keystone::service::begin']
-
-  # all db settings should be applied and all packages should be installed
-  # before dbsync starts
-  Oslo::Db<||> -> Anchor['keystone::dbsync::begin']
-
-  # policy config should occur in the config block also.
-  Anchor['keystone::config::begin']
-  -> Openstacklib::Policy<| tag == 'keystone' |>
   -> Anchor['keystone::config::end']
 
   # Support packages need to be installed in the install phase, but we don't

manifests/init.pp

@@ -548,6 +548,9 @@ class keystone(
           hasrestart => true,
           tag        => 'keystone-service',
         }
+
+        # On any uwsgi config change, we must restart Keystone.
+        Keystone_uwsgi_config<||> ~> Service['keystone']
       }
       'httpd': {
         include apache::params

manifests/policy.pp

@@ -65,11 +65,15 @@ class keystone::policy (
     file_group   => $::keystone::params::group,
     file_format  => 'yaml',
     purge_config => $purge_config,
-    tag          => 'keystone',
   }
 
   create_resources('openstacklib::policy', { $policy_path => $policy_parameters })
 
+  # policy config should occur in the config block also.
+  Anchor['keystone::config::begin']
+  -> Openstacklib::Policy[$policy_path]
+  -> Anchor['keystone::config::end']
+
   oslo::policy { 'keystone_config':
     enforce_scope        => $enforce_scope,
     enforce_new_defaults => $enforce_new_defaults,

spec/classes/keystone_policy_spec.rb

@@ -33,7 +33,6 @@ describe 'keystone::policy' do
           :file_group   => 'keystone',
           :file_format  => 'yaml',
           :purge_config => false,
-          :tag          => 'keystone',
         )
         is_expected.to contain_oslo__policy('keystone_config').with(
           :enforce_scope        => false,
@@ -64,7 +63,6 @@ describe 'keystone::policy' do
           :file_group   => 'keystone',
           :file_format  => 'yaml',
           :purge_config => true,
-          :tag          => 'keystone',
         )
         is_expected.to contain_oslo__policy('keystone_config').with(
           :enforce_scope        => false,