openstack/puppet-cinder
Code Issues Proposed changes

Fix common options position in params.pp

Browse Source 
These parameters are common for both systems,
they could be moved out from 'case'.

Change-Id: I59e4bd67a53784f19edc18559dd5eb13a026153a
This commit is contained in:
ZhongShengping 2016-11-08 09:41:57 +08:00
parent ae0b525f8a
commit 3a41e5d88b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/params.pp
View File

@ -1,11 +1,15 @@
# == Class: cinder::params
#
# Parameters for puppet-cinder
#
class cinder::params {
include ::openstacklib::defaults
$client_package = 'python-cinderclient'
$cinder_wsgi_script_source = '/usr/bin/cinder-wsgi'
if $::osfamily == 'Debian' {
$package_name = 'cinder-common'
$client_package = 'python-cinderclient'
$api_package = 'cinder-api'
$api_service = 'cinder-api'
$backup_package = 'cinder-backup'
@ -22,12 +26,10 @@ class cinder::params {
$lio_package_name = 'targetcli'
$lock_path = '/var/lock/cinder'
$cinder_wsgi_script_path = '/usr/lib/cgi-bin/cinder'
$cinder_wsgi_script_source = '/usr/bin/cinder-wsgi'
} elsif($::osfamily == 'RedHat') {
$package_name = 'openstack-cinder'
$client_package = 'python-cinderclient'
$api_package = false
$api_service = 'openstack-cinder-api'
$backup_package = false
@ -43,7 +45,6 @@ class cinder::params {
$lio_package_name = 'targetcli'
$lock_path = '/var/lib/cinder/tmp'
$cinder_wsgi_script_path = '/var/www/cgi-bin/cinder'
$cinder_wsgi_script_source = '/usr/bin/cinder-wsgi'
case $::operatingsystem {
'RedHat', 'CentOS', 'Scientific', 'OracleLinux': {