summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-06-15 14:16:13 -0400
committerEmilien Macchi <emilien@redhat.com>2017-06-15 14:16:13 -0400
commita69d3d6018f16344ee6d80c5f723da3f2c579077 (patch)
tree99e69c747fa5186dd684e845943d21e68d5422b4
parent92cd897e386ae4ff98c99befe244c2bfa8996c8f (diff)
include policy class in api.pp
Like we do in other modules, include keystone::policy class in ::keystone so users can define policies without taking care of the class. Change-Id: I69da4d70fd3720a01ce1e166a5725a9c76d4c126
Notes
Notes (review): Code-Review+1: Alexander Chuzhoy <sasha@redhat.com> Code-Review+2: Alex Schultz <aschultz@redhat.com> Code-Review+2: zhongshengping <chdzsp@163.com> Workflow+1: zhongshengping <chdzsp@163.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 16 Jun 2017 23:47:04 +0000 Reviewed-on: https://review.openstack.org/474722 Project: openstack/puppet-keystone Branch: refs/heads/master
-rw-r--r--manifests/init.pp1
-rw-r--r--spec/classes/keystone_init_spec.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index b78553c..2e70365 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -784,6 +784,7 @@ class keystone(
784 784
785 include ::keystone::deps 785 include ::keystone::deps
786 include ::keystone::logging 786 include ::keystone::logging
787 include ::keystone::policy
787 788
788 if $service_provider { 789 if $service_provider {
789 warning("service_provider is deprecated, does nothing and will be removed in a future release, \ 790 warning("service_provider is deprecated, does nothing and will be removed in a future release, \
diff --git a/spec/classes/keystone_init_spec.rb b/spec/classes/keystone_init_spec.rb
index af5aac1..92c186a 100644
--- a/spec/classes/keystone_init_spec.rb
+++ b/spec/classes/keystone_init_spec.rb
@@ -131,6 +131,7 @@ describe 'keystone' do
131 shared_examples_for 'core keystone examples' do |param_hash| 131 shared_examples_for 'core keystone examples' do |param_hash|
132 it { is_expected.to contain_class('keystone::logging') } 132 it { is_expected.to contain_class('keystone::logging') }
133 it { is_expected.to contain_class('keystone::params') } 133 it { is_expected.to contain_class('keystone::params') }
134 it { is_expected.to contain_class('keystone::policy') }
134 135
135 it { is_expected.to contain_package('keystone').with( 136 it { is_expected.to contain_package('keystone').with(
136 'ensure' => param_hash['package_ensure'], 137 'ensure' => param_hash['package_ensure'],