From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 23 Feb 2017 18:05:06 +0000 (+0100)
Subject: no need for the ynic-special lldp module anymore - we put lldp everywhere
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=5a7c80d8eff8cdd46fd1c03071a72ac2d2d60a11

no need for the ynic-special lldp module anymore - we put lldp everywhere
---

diff --git a/manifests/site.pp b/manifests/site.pp
index c671af508..098b96a66 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -124,12 +124,6 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hoster {
-		if $::hoster in [ynic] {
-			include lldp
-		}
-	}
-
 	if $::hostname == 'pkgmirror-csail' {
 		include varnish
 	}
diff --git a/modules/lldp/manifests/init.pp b/modules/lldp/manifests/init.pp
deleted file mode 100644
index 0dd6a26e2..000000000
--- a/modules/lldp/manifests/init.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class lldp {
-	package { 'lldpd':
-		ensure => installed
-	}
-
-	service { 'lldpd':
-		ensure    => running,
-		hasstatus => false,
-		pattern   => '/usr/sbin/lldpd',
-		require   => Package['lldpd']
-	}
-}