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: Idb81b55435c9b36ae0d6b67c126f22f60161f388 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -48,8 +48,8 @@
|
|||||||
class nova::policy (
|
class nova::policy (
|
||||||
$enforce_scope = $facts['os_service_default'],
|
$enforce_scope = $facts['os_service_default'],
|
||||||
$enforce_new_defaults = $facts['os_service_default'],
|
$enforce_new_defaults = $facts['os_service_default'],
|
||||||
Hash $policies = {},
|
Openstacklib::Policies $policies = {},
|
||||||
$policy_path = '/etc/nova/policy.yaml',
|
Stdlib::Absolutepath $policy_path = '/etc/nova/policy.yaml',
|
||||||
$policy_default_rule = $facts['os_service_default'],
|
$policy_default_rule = $facts['os_service_default'],
|
||||||
$policy_dirs = $facts['os_service_default'],
|
$policy_dirs = $facts['os_service_default'],
|
||||||
Boolean $purge_config = false,
|
Boolean $purge_config = false,
|
||||||
@@ -64,7 +64,6 @@ class nova::policy (
|
|||||||
file_group => $nova::params::group,
|
file_group => $nova::params::group,
|
||||||
file_format => 'yaml',
|
file_format => 'yaml',
|
||||||
purge_config => $purge_config,
|
purge_config => $purge_config,
|
||||||
tag => 'nova',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
create_resources('openstacklib::policy', { $policy_path => $policy_parameters })
|
create_resources('openstacklib::policy', { $policy_path => $policy_parameters })
|
||||||
|
@@ -33,7 +33,6 @@ describe 'nova::policy' do
|
|||||||
:file_group => 'nova',
|
:file_group => 'nova',
|
||||||
:file_format => 'yaml',
|
:file_format => 'yaml',
|
||||||
:purge_config => false,
|
:purge_config => false,
|
||||||
:tag => 'nova',
|
|
||||||
)
|
)
|
||||||
is_expected.to contain_oslo__policy('nova_config').with(
|
is_expected.to contain_oslo__policy('nova_config').with(
|
||||||
:enforce_scope => false,
|
:enforce_scope => false,
|
||||||
@@ -64,7 +63,6 @@ describe 'nova::policy' do
|
|||||||
:file_group => 'nova',
|
:file_group => 'nova',
|
||||||
:file_format => 'yaml',
|
:file_format => 'yaml',
|
||||||
:purge_config => true,
|
:purge_config => true,
|
||||||
:tag => 'nova',
|
|
||||||
)
|
)
|
||||||
is_expected.to contain_oslo__policy('nova_config').with(
|
is_expected.to contain_oslo__policy('nova_config').with(
|
||||||
:enforce_scope => false,
|
:enforce_scope => false,
|
||||||
|
Reference in New Issue
Block a user