stackforge/puppet-openstack
Code Issues Proposed changes

Fix Operating system dist regex logic to behave correctly

Browse Source 
The dist regex match doesnt quite work correctly today. Fixing the
logic to use case to match the appropriate values and get the
correct dist value.

Change-Id: Ib7c73edd12d7e5e8feeb556a8928d708db8a482c
This commit is contained in:
Pradeep Kilambi
2013-09-24 17:53:05 -04:00
parent 22b7edbdc4
commit ca421cf487
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/repo/rdo.pp
View File

@@ -3,9 +3,9 @@ class openstack::repo::rdo {
include openstack::repo::epel include openstack::repo::epel
if $::osfamily == 'RedHat' { if $::osfamily == 'RedHat' {
$dist = $::operatingsystem ? { case $operatingsystem {
/(CentOS|RedHat|Scientific|SLC)/ => 'epel', centos, redhat, scientific, slc: { $dist = 'epel' }
'Fedora' => 'fedora', fedora: { $dist = 'fedora' }
} }
# $lsbmajdistrelease is only available with redhat-lsb installed # $lsbmajdistrelease is only available with redhat-lsb installed
$osver = regsubst($::operatingsystemrelease, '(\d+)\..*', '\1') $osver = regsubst($::operatingsystemrelease, '(\d+)\..*', '\1')