diff --git a/manifests/deps.pp b/manifests/deps.pp index cbc91b40..866d55d0 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -56,11 +56,11 @@ class ironic::deps { # policy config should occur in the config block also. Anchor['ironic::config::begin'] - -> Openstacklib::Policy<||> + -> Openstacklib::Policy<| tag == 'ironic' |> ~> Anchor['ironic::config::end'] Anchor['ironic-inspector::config::begin'] - -> Openstacklib::Policy<||> + -> Openstacklib::Policy<| tag == 'ironic-inspector' |> ~> Anchor['ironic-inspector::config::end'] # Support packages need to be installed in the install phase, but we don't diff --git a/manifests/inspector/policy.pp b/manifests/inspector/policy.pp index 9f7370bd..ac22cd2d 100644 --- a/manifests/inspector/policy.pp +++ b/manifests/inspector/policy.pp @@ -65,6 +65,7 @@ class ironic::inspector::policy ( file_group => $::ironic::params::inspector_group, file_format => 'yaml', purge_config => $purge_config, + tag => 'ironic-inspector', } create_resources('openstacklib::policy', { $policy_path => $policy_parameters }) diff --git a/manifests/policy.pp b/manifests/policy.pp index af4fa4d8..b1044a72 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -65,6 +65,7 @@ class ironic::policy ( file_group => $::ironic::params::group, file_format => 'yaml', purge_config => $purge_config, + tag => 'ironic', } create_resources('openstacklib::policy', { $policy_path => $policy_parameters }) diff --git a/spec/classes/ironic_inspector_policy_spec.rb b/spec/classes/ironic_inspector_policy_spec.rb index 8d3685d1..8c4618d8 100644 --- a/spec/classes/ironic_inspector_policy_spec.rb +++ b/spec/classes/ironic_inspector_policy_spec.rb @@ -33,6 +33,7 @@ describe 'ironic::inspector::policy' do :file_group => 'ironic-inspector', :file_format => 'yaml', :purge_config => false, + :tag => 'ironic-inspector', ) is_expected.to contain_oslo__policy('ironic_inspector_config').with( :enforce_scope => false, @@ -63,6 +64,7 @@ describe 'ironic::inspector::policy' do :file_group => 'ironic-inspector', :file_format => 'yaml', :purge_config => true, + :tag => 'ironic-inspector', ) is_expected.to contain_oslo__policy('ironic_inspector_config').with( :enforce_scope => false, diff --git a/spec/classes/ironic_policy_spec.rb b/spec/classes/ironic_policy_spec.rb index 1a30dc1a..550dd743 100644 --- a/spec/classes/ironic_policy_spec.rb +++ b/spec/classes/ironic_policy_spec.rb @@ -33,6 +33,7 @@ describe 'ironic::policy' do :file_group => 'ironic', :file_format => 'yaml', :purge_config => false, + :tag => 'ironic', ) is_expected.to contain_oslo__policy('ironic_config').with( :enforce_scope => false, @@ -63,6 +64,7 @@ describe 'ironic::policy' do :file_group => 'ironic', :file_format => 'yaml', :purge_config => true, + :tag => 'ironic', ) is_expected.to contain_oslo__policy('ironic_config').with( :enforce_scope => false,