Merge "Use versioncmp for '::operatingsystemmajrelease' comparison"

This commit is contained in:
Jenkins 2015-03-31 15:56:06 +00:00 committed by Gerrit Code Review
commit cf654ec8d6

View File

@ -36,7 +36,7 @@ class manila::params {
$ceph_init_override = '/etc/sysconfig/openstack-manila-share' $ceph_init_override = '/etc/sysconfig/openstack-manila-share'
$lio_package_name = 'targetcli' $lio_package_name = 'targetcli'
if $::operatingsystem == 'RedHat' and $::operatingsystemmajrelease >= 7 { if $::operatingsystem == 'RedHat' and (versioncmp($::operatingsystemmajrelease, '7') >= 0) {
$iscsi_helper = 'lioadm' $iscsi_helper = 'lioadm'
} else { } else {
$iscsi_helper = 'tgtadm' $iscsi_helper = 'tgtadm'