From 5a7c80d8eff8cdd46fd1c03071a72ac2d2d60a11 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 23 Feb 2017 19:05:06 +0100 Subject: [PATCH] no need for the ynic-special lldp module anymore - we put lldp everywhere --- manifests/site.pp | 6 ------ modules/lldp/manifests/init.pp | 12 ------------ 2 files changed, 18 deletions(-) delete mode 100644 modules/lldp/manifests/init.pp 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'] - } -} -- 2.20.1