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
This commit is contained in:
parent
37049a867d
commit
cc2231b8fe
@ -60,19 +60,6 @@ class gnocchi::policy (
|
|||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $policies)
|
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 = {
|
$policy_parameters = {
|
||||||
policies => $policies,
|
policies => $policies,
|
||||||
policy_path => $policy_path,
|
policy_path => $policy_path,
|
||||||
|
Loading…
Reference in New Issue
Block a user