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

diff --git a/manifests/site.pp b/manifests/site.pp
index c671af5..098b96a 100644 (file)
--- 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 (file)
index 0dd6a26..0000000
--- 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']
-       }
-}