From 8a9f271eacc6720639e782fed60739b702b295b0 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 27 Sep 2025 23:51:51 +0900 Subject: [PATCH] Import base parameter types for ::policy Import the parameter types from openstacklib::policy so that parameter types are validated at module level, instead of internal resource call. Also remove the tag which is no longer necessary after dependency refactoring. Change-Id: I3f88aa810d9ca6921d0f673542762b66a4090edf Signed-off-by: Takashi Kajinami --- manifests/policy.pp | 15 +++++++-------- spec/classes/magnum_policy_spec.rb | 2 -- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/manifests/policy.pp b/manifests/policy.pp index 9140495..3030e34 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -46,13 +46,13 @@ # Defaults to false. # class magnum::policy ( - $enforce_scope = $facts['os_service_default'], - $enforce_new_defaults = $facts['os_service_default'], - Hash $policies = {}, - $policy_path = '/etc/magnum/policy.yaml', - $policy_default_rule = $facts['os_service_default'], - $policy_dirs = $facts['os_service_default'], - Boolean $purge_config = false, + $enforce_scope = $facts['os_service_default'], + $enforce_new_defaults = $facts['os_service_default'], + Openstacklib::Policies $policies = {}, + Stdlib::Absolutepath $policy_path = '/etc/magnum/policy.yaml', + $policy_default_rule = $facts['os_service_default'], + $policy_dirs = $facts['os_service_default'], + Boolean $purge_config = false, ) { include magnum::deps include magnum::params @@ -64,7 +64,6 @@ class magnum::policy ( file_group => $magnum::params::group, file_format => 'yaml', purge_config => $purge_config, - tag => 'magnum', } create_resources('openstacklib::policy', { $policy_path => $policy_parameters }) diff --git a/spec/classes/magnum_policy_spec.rb b/spec/classes/magnum_policy_spec.rb index 2ba4e69..b258b58 100644 --- a/spec/classes/magnum_policy_spec.rb +++ b/spec/classes/magnum_policy_spec.rb @@ -33,7 +33,6 @@ describe 'magnum::policy' do :file_group => 'magnum', :file_format => 'yaml', :purge_config => false, - :tag => 'magnum', ) is_expected.to contain_oslo__policy('magnum_config').with( :enforce_scope => false, @@ -64,7 +63,6 @@ describe 'magnum::policy' do :file_group => 'magnum', :file_format => 'yaml', :purge_config => true, - :tag => 'magnum', ) is_expected.to contain_oslo__policy('magnum_config').with( :enforce_scope => false,