summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-06-15 13:59:23 -0400
committerEmilien Macchi <emilien@redhat.com>2017-06-15 14:00:01 -0400
commit7da4ea078404a83dc64aba1ea5237ed8eae092d9 (patch)
tree10b012e599cd1f209789e6fcc6246eeedb6696c1
parent5a2ee335c27e43fbf9adeb37cfd3b7b186434d5e (diff)
include policy class in api.pp
Like we do in other modules, include barbican::policy class in barbican::api so users can define policies without taking care of the class. Change-Id: I5eb4fb17c3ba4a644efdc67ef4b60615c8e6831e
Notes
Notes (review): Code-Review+2: Alex Schultz <aschultz@redhat.com> Code-Review+2: Iury Gregory Melo Ferreira <iurygregory@gmail.com> Workflow+1: Iury Gregory Melo Ferreira <iurygregory@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 16 Jun 2017 21:43:41 +0000 Reviewed-on: https://review.openstack.org/474717 Project: openstack/puppet-barbican Branch: refs/heads/master
-rw-r--r--manifests/api.pp1
-rw-r--r--spec/classes/barbican_api_spec.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/manifests/api.pp b/manifests/api.pp
index 1bbb21b..2985809 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -316,6 +316,7 @@ class barbican::api (
316 include ::barbican::db 316 include ::barbican::db
317 include ::barbican::api::logging 317 include ::barbican::api::logging
318 include ::barbican::client 318 include ::barbican::client
319 include ::barbican::policy
319 320
320 if !is_service_default($rabbit_host) or 321 if !is_service_default($rabbit_host) or
321 !is_service_default($rabbit_hosts) or 322 !is_service_default($rabbit_hosts) or
diff --git a/spec/classes/barbican_api_spec.rb b/spec/classes/barbican_api_spec.rb
index 3697700..777f6ae 100644
--- a/spec/classes/barbican_api_spec.rb
+++ b/spec/classes/barbican_api_spec.rb
@@ -136,6 +136,7 @@ describe 'barbican::api' do
136 it { is_expected.to contain_class('barbican::deps') } 136 it { is_expected.to contain_class('barbican::deps') }
137 it { is_expected.to contain_class('barbican::api::logging') } 137 it { is_expected.to contain_class('barbican::api::logging') }
138 it { is_expected.to contain_class('barbican::db') } 138 it { is_expected.to contain_class('barbican::db') }
139 it { is_expected.to contain_class('barbican::policy') }
139 140
140 it { is_expected.to contain_package('barbican-api').with( 141 it { is_expected.to contain_package('barbican-api').with(
141 :tag => ['openstack', 'barbican-package'], 142 :tag => ['openstack', 'barbican-package'],