diff --git a/manifests/coordination.pp b/manifests/coordination.pp index afcc73d..f501163 100644 --- a/manifests/coordination.pp +++ b/manifests/coordination.pp @@ -26,4 +26,8 @@ class mistral::coordination ( mistral_config { 'coordination/heartbeat_interval': value => $heartbeat_interval; } + + # all coordination settings should be applied and all packages should be + # installed before service startup + Oslo::Coordination['mistral_config'] -> Anchor['mistral::service::begin'] } diff --git a/manifests/db.pp b/manifests/db.pp index 970857f..27e12d5 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -69,4 +69,7 @@ class mistral::db ( db_max_retries => $database_db_max_retries, } + # all db settings should be applied and all packages should be installed + # before dbsync starts + Oslo::Db['mistral_config'] -> Anchor['mistral::dbsync::begin'] } diff --git a/manifests/deps.pp b/manifests/deps.pp index b41e79c..302f38a 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -24,19 +24,6 @@ class mistral::deps { ~> Service<| tag == 'mistral-service' |> ~> anchor { 'mistral::service::end': } - # all coordination settings should be applied and all packages should be - # installed before service startup - Oslo::Coordination<||> -> Anchor['mistral::service::begin'] - - # all db settings should be applied and all packages should be installed - # before dbsync starts - Oslo::Db<||> -> Anchor['mistral::dbsync::begin'] - - # policy config should occur in the config block - Anchor['mistral::config::begin'] - -> Openstacklib::Policy<| tag == 'mistral' |> - -> Anchor['mistral::config::end'] - # We need openstackclient before marking service end so that mistral # will have clients available to create resources. This tag handles the # openstackclient but indirectly since the client is not available in diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 1c0cf23..5b9c678 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -279,4 +279,6 @@ class mistral::keystone::authtoken( service_type => $service_type, interface => $interface; } + + Keystone::Resource::Authtoken['mistral_config'] -> Anchor['mistral::config::end'] } diff --git a/manifests/policy.pp b/manifests/policy.pp index 0669b76..4b0e9f1 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -70,6 +70,11 @@ class mistral::policy ( create_resources('openstacklib::policy', { $policy_path => $policy_parameters }) + # policy config should occur in the config block + Anchor['mistral::config::begin'] + -> Openstacklib::Policy[$policy_path] + -> Anchor['mistral::config::end'] + oslo::policy { 'mistral_config': enforce_scope => $enforce_scope, enforce_new_defaults => $enforce_new_defaults,