diff --git a/manifests/policy.pp b/manifests/policy.pp index 88976cd..9b6d06b 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -46,13 +46,13 @@ # Defaults to false. # class mistral::policy ( - $enforce_scope = $facts['os_service_default'], - $enforce_new_defaults = $facts['os_service_default'], - Hash $policies = {}, - $policy_path = '/etc/mistral/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/mistral/policy.yaml', + $policy_default_rule = $facts['os_service_default'], + $policy_dirs = $facts['os_service_default'], + Boolean $purge_config = false, ) { include mistral::deps include mistral::params @@ -64,12 +64,11 @@ class mistral::policy ( file_group => $mistral::params::group, file_format => 'yaml', purge_config => $purge_config, - tag => 'mistral', } create_resources('openstacklib::policy', { $policy_path => $policy_parameters }) - # policy config should occur in the config block + # policy config should occur in the config block also. Anchor['mistral::config::begin'] -> Openstacklib::Policy[$policy_path] -> Anchor['mistral::config::end'] diff --git a/spec/classes/mistral_policy_spec.rb b/spec/classes/mistral_policy_spec.rb index 27023b1..a54e116 100644 --- a/spec/classes/mistral_policy_spec.rb +++ b/spec/classes/mistral_policy_spec.rb @@ -33,7 +33,6 @@ describe 'mistral::policy' do :file_group => 'mistral', :file_format => 'yaml', :purge_config => false, - :tag => 'mistral', ) is_expected.to contain_oslo__policy('mistral_config').with( :enforce_scope => false, @@ -64,7 +63,6 @@ describe 'mistral::policy' do :file_group => 'mistral', :file_format => 'yaml', :purge_config => true, - :tag => 'mistral', ) is_expected.to contain_oslo__policy('mistral_config').with( :enforce_scope => false,