From 3b109d995056998a98fab3d0ef9ba752f2a36a7b Mon Sep 17 00:00:00 2001
From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Tue, 5 Jul 2016 13:11:53 +0200
Subject: [PATCH] Include openstacklib defaults manifest.

This provides a mechanism for setting default across all modules.

Change-Id: Idb6d7b43900739bee09acb60cac26d7014a45917
Related-Bug: 1599113
Depends-On: I9d0a10d48124ee71ea80134ceef96436c8ee196e
---
 manifests/params.pp               | 1 +
 spec/classes/barbican_api_spec.rb | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index d4739f37..ded4d8c9 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,6 +1,7 @@
 # Parameters for puppet-barbican
 #
 class barbican::params {
+  include ::openstacklib::defaults
 
   case $::osfamily {
     'RedHat': {
diff --git a/spec/classes/barbican_api_spec.rb b/spec/classes/barbican_api_spec.rb
index 4941c532..b680fd4e 100644
--- a/spec/classes/barbican_api_spec.rb
+++ b/spec/classes/barbican_api_spec.rb
@@ -4,10 +4,10 @@ describe 'barbican::api' do
 
   let :facts do
     @default_facts.merge(
-      {
+      OSDefaults.get_facts({
         :osfamily       => 'RedHat',
         :processorcount => '7',
-      }
+      })
     )
   end
 
@@ -91,7 +91,6 @@ describe 'barbican::api' do
       :retry_scheduler_periodic_interval_max_seconds => 20.0,
       :max_allowed_secret_in_bytes                   => 20000,
       :max_allowed_request_size_in_bytes             => 2000000,
-      :enabled                                       => false,
       :auth_url                                      => 'https://keystone.example.com:35357',
       :keystone_password                             => 'bar',
     }
@@ -252,7 +251,7 @@ describe 'barbican::api' do
 
   describe 'on RedHat platforms' do
     let :facts do
-      @default_facts.merge({
+      OSDefaults.get_facts({
         :osfamily               => 'RedHat',
         :operatingsystemrelease => '7',
       })
@@ -266,7 +265,7 @@ describe 'barbican::api' do
 
   describe 'on unknown platforms' do
     let :facts do
-      { :osfamily => 'unknown' }
+      OSDefaults.get_facts({ :osfamily => 'unknown' })
     end
     let(:params) { default_params }