From ea4421397f23e85cfa3173b83f9f3bdfc33d0c73 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 27 Sep 2025 23:50:31 +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: I385786aeb58fe1c2e4b2433dc4932f135756519e
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 manifests/policy.pp                 | 15 +++++++--------
 spec/classes/neutron_policy_spec.rb |  2 --
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/manifests/policy.pp b/manifests/policy.pp
index 48d226db5..ea8875355 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -46,13 +46,13 @@
 #    Defaults to false.
 #
 class neutron::policy (
-  $enforce_scope        = $facts['os_service_default'],
-  $enforce_new_defaults = $facts['os_service_default'],
-  Hash $policies        = {},
-  $policy_path          = '/etc/neutron/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/neutron/policy.yaml',
+  $policy_default_rule              = $facts['os_service_default'],
+  $policy_dirs                      = $facts['os_service_default'],
+  Boolean $purge_config             = false,
 ) {
   include neutron::deps
   include neutron::params
@@ -64,7 +64,6 @@ class neutron::policy (
     file_group   => $neutron::params::group,
     file_format  => 'yaml',
     purge_config => $purge_config,
-    tag          => 'neutron',
   }
 
   create_resources('openstacklib::policy', { $policy_path => $policy_parameters })
diff --git a/spec/classes/neutron_policy_spec.rb b/spec/classes/neutron_policy_spec.rb
index 11827381f..ab705b4cd 100644
--- a/spec/classes/neutron_policy_spec.rb
+++ b/spec/classes/neutron_policy_spec.rb
@@ -33,7 +33,6 @@ describe 'neutron::policy' do
           :file_group   => 'neutron',
           :file_format  => 'yaml',
           :purge_config => false,
-          :tag          => 'neutron',
         )
         is_expected.to contain_oslo__policy('neutron_config').with(
           :enforce_scope        => false,
@@ -64,7 +63,6 @@ describe 'neutron::policy' do
           :file_group   => 'neutron',
           :file_format  => 'yaml',
           :purge_config => true,
-          :tag          => 'neutron',
         )
         is_expected.to contain_oslo__policy('neutron_config').with(
           :enforce_scope        => false,