Merge "Fixes Facts string comparisons in CentOS 7" into stable/icehouse · openstack/puppet-cinder@be74bc6 · GitHub

openstack / puppet-cinder Public

• Notifications You must be signed in to change notification settings
• Fork 73
• Star 57

• Code
• Pull requests
• Actions
• Security and quality
• Insights

Additional navigation options

Commit be74bc6

Browse filesBrowse the repository at this point in the historyBrowse files

Jenkins

authored and

openstack-gerrit

committed

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

2 parents 988a317 + 445b926 commit be74bc6
Copy full SHA for be74bc6

1 file changed

+11-4Lines changed: 11 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• manifests
  • params.pp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎manifests/params.pp‎

Copy file name to clipboardExpand all lines: manifests/params.pp

+11-4Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -40,10 +40,17 @@
40	40	$ceph_init_override = '/etc/sysconfig/openstack-cinder-volume'
41	41	$lio_package_name = 'targetcli'
42	42
43		- if $::operatingsystem == 'RedHat' and $::operatingsystemrelease >= 7 {
44		- $iscsi_helper = 'lioadm'
45		- } else {
46		- $iscsi_helper = 'tgtadm'
	43	+ case $::operatingsystem {
	44	+ 'RedHat', 'CentOS', 'Scientific': {
	45	+ if $::operatingsystemmajrelease >= 7 {
	46	+ $iscsi_helper = 'lioadm'
	47	+ } else {
	48	+ $iscsi_helper = 'tgtadm'
	49	+ }
	50	+ }
	51	+ default: {
	52	+ $Iscsi_helper = 'tgtadm'
	53	+ }
47	54	}
48	55
49	56	} else {

0 commit comments

Comments

0 (0)