From 39b28be81733f2dfe899df63739dec6a2dc98cb9 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Sat, 28 Feb 2015 16:25:09 +0100
Subject: [PATCH] Cinder should use lioadm on Fedora

Fedora has lioadm in since F18. It should be default
for any RedHat based system except RHEL6 based ones.

Change-Id: I469f77cd5a77f9c6bc87e16c6faf5ca9612992ef
---
 manifests/params.pp                      | 2 +-
 spec/classes/cinder_volume_iscsi_spec.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index cffa227a..9801f66e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -50,7 +50,7 @@ class cinder::params {
         }
       }
       default: {
-        $iscsi_helper = 'tgtadm'
+        $iscsi_helper = 'lioadm'
       }
     }
 
diff --git a/spec/classes/cinder_volume_iscsi_spec.rb b/spec/classes/cinder_volume_iscsi_spec.rb
index 93e06224..5352badf 100644
--- a/spec/classes/cinder_volume_iscsi_spec.rb
+++ b/spec/classes/cinder_volume_iscsi_spec.rb
@@ -49,7 +49,9 @@ describe 'cinder::volume::iscsi' do
     end
 
     let :facts do
-      {:osfamily => 'RedHat'}
+      {:osfamily => 'RedHat',
+       :operatingsystem => 'RedHat',
+       :operatingsystemmajrelease => '6'}
     end
 
     it { should contain_file_line('cinder include').with(