diff options
Diffstat (limited to 'lib/policy.js')
| -rw-r--r-- | lib/policy.js | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/policy.js b/lib/policy.js index 0c635e5..4bc40fe 100644 --- a/lib/policy.js +++ b/lib/policy.js @@ -110,11 +110,10 @@ function policyUpdate(req, res, next) { const latest_policy = policy_update.latest_policies[policy_id]; if (policy_update.removed_policies[policy_id] || (policy_update.catch_up - && deployed_policy.policy_body && !latest_policy - && !policy_update.errored_policies[policy_id]) + && !policy_update.errored_policies[policy_id] && !is_policy_in_errored_scopes(policy_id) - && is_policy_in_scopes(policy_id)) { + && is_policy_in_scopes(policy_id))) { have_policies = true; deployment.removed_policy_ids[policy_id] = true; policy_update.removed_policy_ids[policy_id] = true; @@ -123,11 +122,11 @@ function policyUpdate(req, res, next) { } if (!latest_policy || !latest_policy.policy_body - || isNaN(latest_policy.policy_body.policyVersion) - || latest_policy.policy_body.policyVersion - === (deployed_policy.policy_body && deployed_policy.policy_body.policyVersion)) { - return; - } + || isNaN(latest_policy.policy_body.policyVersion)) {return;} + // || latest_policy.policy_body.policyVersion + // === (deployed_policy.policy_body && deployed_policy.policy_body.policyVersion)) { + // return; + // } have_policies = true; deployment.updated_policies[policy_id] = latest_policy; policy_update.updated_policy_ids[policy_id] = true; @@ -140,7 +139,7 @@ function policyUpdate(req, res, next) { logger.debug(req.dcaeReqId, "matching latest policies to policy_filters[" + policy_filter_ids.length + "] on node_instance: " + JSON.stringify(node_instance)); try { Object.keys(policy_update.latest_policies).forEach(policy_id => { - if (deployment.updated_policies[policy_id] || deployed_policies[policy_id]) {return;} + // if (deployment.updated_policies[policy_id] || deployed_policies[policy_id]) {return;} const latest_policy = policy_update.latest_policies[policy_id]; const policy_body = latest_policy && latest_policy.policy_body; |