Merge tmakinen/puppet

Conflicts:
	dovecot/manifests/init.pp
	libvirt/manifests/init.pp
	munin/manifests/init.pp
	puppet/manifests/init.pp
	tftp/manifests/init.pp

yum/files/keys/dell-omsa.key

@@ -0,0 +1,27 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.0.6 (GNU/Linux)
+Comment: For info see http://www.gnupg.org
+
+mQGiBDrbVQQRBACfyqmXDmXKLS/1TUpxb7KMVKqzk3XqiHidQWmRzquo26FReyvR
+2PnGKHVtiBtZcgb+e2rPR/MNyfAGh5Xkjfzq+gPxVAJUbwbM81yo54b8oYGlqogv
+wq0Y6a3H5t9nHENifLbX2HEVH/+eFKcp4gVJqRiUctf8xreUOU/HXuVXvwCgg2HG
+Bm2PAjhRXxchtuyPK7SggaUD/3HsxqqCw97JAnZtMXzL/9gNDuzAB/8SZTtiw+eU
+NbIAieyPydoLyoZKvbaMIHchkSQgZJ8QX6cvaME3xYpSeiUwT3WVztbDy/naEyq5
+VoMMc1thtPt+Z0Bx7lwefZ1HsXmKtUen9X/wrNOjKhOJrInn4RaBw8eE1w8Uh/oj
+SxhbA/0b2xxmmOh1GJxdEKRDMabXu9cJNgTuR8pDG2aGH32bNniLC69Lr34daaJn
+kl0lL5JH2ivqvUB83jTGir0pqf/rWOBgVJ8sfvzhpf4w0QXSuwQsk+UdvlcsalI8
+m5nah+9bRnFsibYX7Y04odE5rzRg6Vv2wqQo9eELnPXdt3JiVLRJRGVsbCBDb21w
+dXRlciBDb3Jwb3JhdGlvbiAoTGludXggU3lzdGVtcyBHcm91cCkgPGxpbnV4LXNl
+Y3VyaXR5QGRlbGwuY29tPohXBBMRAgAXBQI621UEBQsHCgMEAxUDAgMWAgECF4AA
+CgkQyneVHSO2ap2nqACeJKS/llA45VuDrtzUnxPPiWknKtcAniG6aD7ELAM2+SzD
+lG7n1cHZSqyXiEYEEBECAAYFAjujySgACgkQIavu95Lw/AluzACgluS3dEQh4iw3
+t80nI+oZ2ssphEQAnjMXCjnRlkohpMgdJuvHSBuVUPjJuQENBDrbVQUQBAC2h3kC
+wV0pPn44jL7kdeujexYm9hy0ImggCzMHHqplpq1vh0vK2DtZLjM3ZUs68ypCZfDt
+ejvxm+m/e708ZmGxveIk0FbvC9dfuUvn5dmj9gQcXOWxqfjkOgZ2CXXY1fX9Fe4a
+QLI8QuQ5sTn6GreeFQCcJXCGWiNi1Hpyi8k1ZwADBQP+KVolSCJG2KR0qScJN+2O
+MRS6IowNIwLY93GlDekrqxBxVOv0FxRHH8lV0xZWMTWfsIBEZU+Iov6ns3ky4m6J
+ImKZ+xaFHehgCPBy3u2pbrSbHGhMzqa40sU3mI9SA0sOJQ18oX6blNDIwnyveKXw
+ZrXZC6mO7PkRnoa+J/4cvSmIRgQYEQIABgUCOttVBQAKCRDKd5UdI7ZqnYmZAJ97
+LhXpWlSlrm5XCNSfO8BwJGVNGgCfR0hFclor3HLNl28ZVENT1SvbjNQ=
+=sYOa
+-----END PGP PUBLIC KEY BLOCK-----

yum/manifests/init.pp

@@ -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 {