yum: Lint fixes

This commit is contained in:
Ossi Salmi 2014-03-07 19:11:51 +02:00
parent fe3edd7516
commit a5a7b8f15c

View file

@ -136,6 +136,9 @@ class yum::common {
$osname = "el" $osname = "el"
$osver = regsubst($::operatingsystemrelease, '^(\d+)\..*$', '\1') $osver = regsubst($::operatingsystemrelease, '^(\d+)\..*$', '\1')
} }
default: {
fail("yum not supported on ${::operatingsystem}")
}
} }
if $yum_proxy { if $yum_proxy {
@ -379,13 +382,13 @@ class yum::repo::dell {
descr => "Dell OMSA repository - Hardware independent", descr => "Dell OMSA repository - Hardware independent",
mirrorlist => "http://linux.dell.com/repo/hardware/latest/mirrors.cgi?osname=el\$releasever&ve&basearch=\$basearch&native=1&dellsysidpluginver=\$dellsysidpluginver", mirrorlist => "http://linux.dell.com/repo/hardware/latest/mirrors.cgi?osname=el\$releasever&ve&basearch=\$basearch&native=1&dellsysidpluginver=\$dellsysidpluginver",
gpgkey => "puppet:///modules/yum/keys/dell-omsa.key", gpgkey => "puppet:///modules/yum/keys/dell-omsa.key",
require => Package["yum-dellsysid"], require => Package["yum-dellsysid"],
} }
yum::repo { "dell-omsa-specific": yum::repo { "dell-omsa-specific":
descr => "Dell OMSA repository - Hardware specific", descr => "Dell OMSA repository - Hardware specific",
mirrorlist => "http://linux.dell.com/repo/hardware/latest/mirrors.cgi?osname=el\$releasever&basearch=\$basearch&native=1&sys_ven_id=\$sys_ven_id&sys_dev_id=\$sys_dev_id&dellsysidpluginver=\$dellsysidpluginver", mirrorlist => "http://linux.dell.com/repo/hardware/latest/mirrors.cgi?osname=el\$releasever&basearch=\$basearch&native=1&sys_ven_id=\$sys_ven_id&sys_dev_id=\$sys_dev_id&dellsysidpluginver=\$dellsysidpluginver",
gpgkey => "puppet:///modules/yum/keys/dell-omsa.key", gpgkey => "puppet:///modules/yum/keys/dell-omsa.key",
require => Package["yum-dellsysid"], require => Package["yum-dellsysid"],
} }
} }
default: { default: {
@ -592,7 +595,7 @@ class yum::repo::skype {
} }
# Add Puppetlabs repositories # Add Puppetlabs products repository.
# #
class yum::repo::puppetlabs { class yum::repo::puppetlabs {
@ -623,6 +626,8 @@ class yum::repo::puppetlabs {
} }
# Add Puppetlabs dependencies repository.
#
class yum::repo::puppetlabs::dependencies { class yum::repo::puppetlabs::dependencies {
case $::operatingsystem { case $::operatingsystem {