tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tmakinen/puppet

Browse source 
Conflicts:
	dovecot/manifests/init.pp
	libvirt/manifests/init.pp
	munin/manifests/init.pp
	puppet/manifests/init.pp
	tftp/manifests/init.pp
This commit is contained in:
Ossi Salmi 2012-11-16 19:40:31 +02:00
commit 98767cfb2a
45 changed files with 5517 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

40
yum/manifests/init.pp
View file

@ -129,7 +129,7 @@ class yum::exclude {
augeas { "yum-exclude":
context => "/files/etc/yum.conf/main",
changes => "set exclude ${yum_exclude_real}",
changes => "set exclude '${yum_exclude_real}'",
}
}
@ -257,6 +257,44 @@ class yum::repo::centos-cr {
}
class yum::repo::dell {
case $::operatingsystem {
"centos", "redhat": { }
default: {
fail("Dell OMSA repository not supported in ${operatingsystem}")
}
}
# Required for detecting the correct system hardware via
# yum. Dell's repo then provide their own yum-dellsysid after
# installing the repos.
package { "yum-dellsysid":
ensure => installed,
require => Class["yum::repo::epel"],
}
case $operatingsystemrelease {
/^6\.[0-9]+/: {
yum::repo { "dell-omsa-indep":
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",
gpgkey => "puppet:///modules/yum/keys/dell-omsa.key",
require => Package["yum-dellsysid"],
}
yum::repo { "dell-omsa-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",
gpgkey => "puppet:///modules/yum/keys/dell-omsa.key",
require => Package["yum-dellsysid"],
}
}
default: {
fail("Dell OMSA repository not supported in ${operatingsystem} ${operatingsystemrelease}")
}
}
}
class yum::repo::elrepo {