
The default value for iscsi_helper isn't correctly configured in volume::iscsi. This commit fix also a typo in the params class. Closes-Bug: 1341091 Change-Id: Idcad78c78405c17518b8f4fe75e9954107b386f9
60 lines
1.9 KiB
Puppet
60 lines
1.9 KiB
Puppet
#
|
|
class cinder::params {
|
|
|
|
$cinder_conf = '/etc/cinder/cinder.conf'
|
|
$cinder_paste_api_ini = '/etc/cinder/api-paste.ini'
|
|
|
|
if $::osfamily == 'Debian' {
|
|
$package_name = 'cinder-common'
|
|
$client_package = 'python-cinderclient'
|
|
$api_package = 'cinder-api'
|
|
$api_service = 'cinder-api'
|
|
$backup_package = 'cinder-backup'
|
|
$backup_service = 'cinder-backup'
|
|
$scheduler_package = 'cinder-scheduler'
|
|
$scheduler_service = 'cinder-scheduler'
|
|
$volume_package = 'cinder-volume'
|
|
$volume_service = 'cinder-volume'
|
|
$db_sync_command = 'cinder-manage db sync'
|
|
$tgt_package_name = 'tgt'
|
|
$tgt_service_name = 'tgt'
|
|
$ceph_init_override = '/etc/init/cinder-volume.override'
|
|
$iscsi_helper = 'tgtadm'
|
|
$lio_package_name = 'targetcli'
|
|
|
|
} elsif($::osfamily == 'RedHat') {
|
|
|
|
$package_name = 'openstack-cinder'
|
|
$client_package = 'python-cinderclient'
|
|
$api_package = false
|
|
$api_service = 'openstack-cinder-api'
|
|
$backup_package = false
|
|
$backup_service = 'openstack-cinder-backup'
|
|
$scheduler_package = false
|
|
$scheduler_service = 'openstack-cinder-scheduler'
|
|
$volume_package = false
|
|
$volume_service = 'openstack-cinder-volume'
|
|
$db_sync_command = 'cinder-manage db sync'
|
|
$tgt_package_name = 'scsi-target-utils'
|
|
$tgt_service_name = 'tgtd'
|
|
$ceph_init_override = '/etc/sysconfig/openstack-cinder-volume'
|
|
$lio_package_name = 'targetcli'
|
|
|
|
case $::operatingsystem {
|
|
'RedHat', 'CentOS', 'Scientific': {
|
|
if $::operatingsystemmajrelease >= 7 {
|
|
$iscsi_helper = 'lioadm'
|
|
} else {
|
|
$iscsi_helper = 'tgtadm'
|
|
}
|
|
}
|
|
default: {
|
|
$iscsi_helper = 'tgtadm'
|
|
}
|
|
}
|
|
|
|
} else {
|
|
fail("unsuported osfamily ${::osfamily}, currently Debian and Redhat are the only supported platforms")
|
|
}
|
|
}
|