Merge "Fixes Facts string comparisons in CentOS 7" into stable/icehouse

openstack · Jul 10, 2014 · be74bc6 · be74bc6
2 parents 988a317 + 445b926
commit be74bc6
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -40,10 +40,17 @@
     $ceph_init_override = '/etc/sysconfig/openstack-cinder-volume'
     $lio_package_name   = 'targetcli'
 
-    if $::operatingsystem == 'RedHat' and $::operatingsystemrelease >= 7 {
-      $iscsi_helper = 'lioadm'
-    } else {
-      $iscsi_helper = 'tgtadm'
+    case $::operatingsystem {
+      'RedHat', 'CentOS', 'Scientific': {
+        if $::operatingsystemmajrelease >= 7 {
+          $iscsi_helper = 'lioadm'
+        } else {
+          $iscsi_helper = 'tgtadm'
+        }
+      }
+      default: {
+        $Iscsi_helper = 'tgtadm'
+      }
     }
 
   } else {