From c21f17ab417cf4e08c0207416812eda8ebf8bab0 Mon Sep 17 00:00:00 2001
From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Thu, 7 Jul 2016 12:00:49 +0200
Subject: [PATCH] Include openstacklib defaults manifest.

This provides a mechanism for setting default across all modules.

Change-Id: I1fd8be1a12a2c5af2a61aeba13819be1eaa6b103
Related-Bug: 1599113
---
 manifests/params.pp                         | 1 +
 spec/classes/cinder_volume_emc_vnx_spec.rb  | 2 +-
 spec/defines/cinder_backend_emc_vnx_spec.rb | 2 +-
 spec/defines/cinder_backend_iscsi_spec.rb   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index d97697d8..de85b14d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,6 +1,7 @@
 # == Class: cinder::params
 #
 class cinder::params {
+  include ::openstacklib::defaults
 
   if $::osfamily == 'Debian' {
     $package_name              = 'cinder-common'
diff --git a/spec/classes/cinder_volume_emc_vnx_spec.rb b/spec/classes/cinder_volume_emc_vnx_spec.rb
index c7fdaa39..51fbe733 100644
--- a/spec/classes/cinder_volume_emc_vnx_spec.rb
+++ b/spec/classes/cinder_volume_emc_vnx_spec.rb
@@ -12,7 +12,7 @@ describe 'cinder::volume::emc_vnx' do
   end
 
   let :facts do
-    {:osfamily => 'Redhat' }
+    OSDefaults.get_facts({:osfamily => 'Redhat' })
   end
 
   let :params do
diff --git a/spec/defines/cinder_backend_emc_vnx_spec.rb b/spec/defines/cinder_backend_emc_vnx_spec.rb
index 996dd02c..78eaa829 100644
--- a/spec/defines/cinder_backend_emc_vnx_spec.rb
+++ b/spec/defines/cinder_backend_emc_vnx_spec.rb
@@ -14,7 +14,7 @@ describe 'cinder::backend::emc_vnx' do
   end
 
   let :facts do
-    {:osfamily => 'Redhat' }
+    OSDefaults.get_facts({:osfamily => 'Redhat' })
   end
 
   let :params do
diff --git a/spec/defines/cinder_backend_iscsi_spec.rb b/spec/defines/cinder_backend_iscsi_spec.rb
index 0451a77d..7337248b 100644
--- a/spec/defines/cinder_backend_iscsi_spec.rb
+++ b/spec/defines/cinder_backend_iscsi_spec.rb
@@ -84,7 +84,7 @@ describe 'cinder::backend::iscsi' do
   describe 'with RedHat' do
 
     let :facts do
-      {:osfamily => 'RedHat'}
+      OSDefaults.get_facts({:osfamily => 'RedHat'})
     end
 
     it { is_expected.to contain_file_line('cinder include').with(