openstack/puppet-manila
Code Issues Proposed changes

Fix common options position and remove unused parameters

Browse Source 
Some parameters are common for both systems,
they could be moved out from 'case'.
Some parameters have not been used, so reomve them.

Change-Id: I100720a4dc6e6f8b9c8e2322fc58d7646e39b8d6
This commit is contained in:
ZhongShengping 2016-11-08 10:19:48 +08:00
parent cf94b0eff0
commit 1c374835c1
1 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
manifests/params.pp
View File

@ -1,3 +1,6 @@
# == Class: manila::params
#
# Parameters for puppet-manila
# #
class manila::params { class manila::params {
@ -5,50 +8,36 @@ class manila::params {
$manila_conf = '/etc/manila/manila.conf' $manila_conf = '/etc/manila/manila.conf'
$manila_paste_api_ini = '/etc/manila/api-paste.ini' $manila_paste_api_ini = '/etc/manila/api-paste.ini'
if $::osfamily == 'Debian' {
$package_name = 'manila-common'
$client_package = 'python-manilaclient' $client_package = 'python-manilaclient'
$db_sync_command = 'manila-manage db sync'
$lio_package_name = 'targetcli'
case $::osfamily {
'Debian': {
$package_name = 'manila-common'
$api_package = 'manila-api' $api_package = 'manila-api'
$api_service = 'manila-api' $api_service = 'manila-api'
$scheduler_package = 'manila-scheduler' $scheduler_package = 'manila-scheduler'
$scheduler_service = 'manila-scheduler' $scheduler_service = 'manila-scheduler'
$share_package = 'manila-share' $share_package = 'manila-share'
$share_service = 'manila-share' $share_service = 'manila-share'
$db_sync_command = 'manila-manage db sync'
$tgt_package_name = 'tgt'
$tgt_service_name = 'tgt'
$ceph_init_override = '/etc/init/manila-share.override'
$iscsi_helper = 'tgtadm'
$lio_package_name = 'targetcli'
$gluster_client_package_name = 'glusterfs-client' $gluster_client_package_name = 'glusterfs-client'
$gluster_package_name = 'glusterfs-common' $gluster_package_name = 'glusterfs-common'
}
} elsif($::osfamily == 'RedHat') { 'RedHat': {
$package_name = 'openstack-manila' $package_name = 'openstack-manila'
$client_package = 'python-manilaclient'
$api_package = false $api_package = false
$api_service = 'openstack-manila-api' $api_service = 'openstack-manila-api'
$scheduler_package = false $scheduler_package = false
$scheduler_service = 'openstack-manila-scheduler' $scheduler_service = 'openstack-manila-scheduler'
$share_package = 'openstack-manila-share' $share_package = 'openstack-manila-share'
$share_service = 'openstack-manila-share' $share_service = 'openstack-manila-share'
$db_sync_command = 'manila-manage db sync'
$tgt_package_name = 'scsi-target-utils'
$tgt_service_name = 'tgtd'
$ceph_init_override = '/etc/sysconfig/openstack-manila-share'
$lio_package_name = 'targetcli'
$gluster_client_package_name = 'glusterfs-fuse' $gluster_client_package_name = 'glusterfs-fuse'
$gluster_package_name = 'glusterfs' $gluster_package_name = 'glusterfs'
if $::operatingsystem == 'RedHat' and (versioncmp($::operatingsystemmajrelease, '7') >= 0) {
$iscsi_helper = 'lioadm'
} else {
$iscsi_helper = 'tgtadm'
} }
default: {
} else {
fail("unsupported osfamily ${::osfamily}, currently Debian and Redhat are the only supported platforms") fail("unsupported osfamily ${::osfamily}, currently Debian and Redhat are the only supported platforms")
} }
}
} }