From cc2231b8fe0cb4d39c1a0df415ccc839b513e22e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 17 Mar 2023 12:33:11 +0900 Subject: [PATCH] Remove unnecessary policy conversion The gnocchi packages available in recent releases contain the changes for policy-in-code feature so no longer require the default policies. Change-Id: I0f3e5a7a3abec869246a248d390d86b40a7da432 --- manifests/policy.pp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/manifests/policy.pp b/manifests/policy.pp index 479eeae2..1dc91905 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -60,19 +60,6 @@ class gnocchi::policy ( validate_legacy(Hash, 'validate_hash', $policies) - if ! $purge_config { - # TODO(tkajinam): Remove this once version with policy-in-code implementation - # is released. - exec { 'gnocci-oslopolicy-convert-json-to-yaml': - command => "oslopolicy-convert-json-to-yaml --namespace gnocchi --policy-file /etc/gnocchi/policy.json --output-file ${policy_path}", - unless => "test -f ${policy_path}", - path => ['/bin','/usr/bin','/usr/local/bin'], - require => Anchor['gnocchi::install::end'], - } - Exec<| title == 'gnocchi-oslopolicy-convert-json-to-yaml' |> - -> File<| title == $policy_path |> - } - $policy_parameters = { policies => $policies, policy_path => $policy_path,