From: Peter Palfrader Date: Sun, 13 Jul 2014 20:18:53 +0000 (+0200) Subject: retire lw05, lw06 X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=89dc176b5323c27a599c55e91cff0ce710abfbec retire lw05, lw06 --- diff --git a/modules/autofs/manifests/init.pp b/modules/autofs/manifests/init.pp index 58f10dc3..e72f1164 100644 --- a/modules/autofs/manifests/init.pp +++ b/modules/autofs/manifests/init.pp @@ -3,7 +3,7 @@ class autofs { pejacevic, piu-slave-bm-a, picconi, coccia, couper, dillon, donizetti, ticharich, delfin, quantz: { include autofs::bytemark } - lw05,lw06,lw07,lw08: { + lw07,lw08: { include autofs::leaseweb } } diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 7f2139ac..5ffc596c 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -173,26 +173,6 @@ class ferm::per-host { rule => 'proto tcp daddr 206.12.19.150 dport 80 REDIRECT to-ports 6081', } } - lw05: { - @ferm::rule { 'dsa-snapshot-varnish': - rule => '&SERVICE(tcp, 6081)', - } - @ferm::rule { 'dsa-nat-snapshot-varnish': - table => 'nat', - chain => 'PREROUTING', - rule => 'proto tcp daddr 185.17.185.181 dport 80 REDIRECT to-ports 6081', - } - } - lw06: { - @ferm::rule { 'dsa-snapshot-varnish': - rule => '&SERVICE(tcp, 6081)', - } - @ferm::rule { 'dsa-nat-snapshot-varnish': - table => 'nat', - chain => 'PREROUTING', - rule => 'proto tcp daddr 185.17.185.182 dport 80 REDIRECT to-ports 6081', - } - } lw07: { @ferm::rule { 'dsa-snapshot-varnish': rule => '&SERVICE(tcp, 6081)',