From fda773d7adcef3c7bf7c999d2038656aeeba0268 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 11 Mar 2017 21:56:13 +0100 Subject: [PATCH] retire glinka --- manifests/site.pp | 2 +- modules/debian-org/misc/local.yaml | 1 - .../templates/multipath-ubc-ganeti.conf.erb | 13 ------------- modules/nfs-server/manifests/init.pp | 3 --- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 098b96a66..178fc2d31 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -96,7 +96,7 @@ node default { include named::geodns } - if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] { + if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] { include nfs-server } diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index cb09c8bfc..8aec03557 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -39,7 +39,6 @@ nameinfo: fischer.debian.org: Johann Caspar Ferdinand Fischer (September 9th, 1656 - August 27th, 1746) gideon.debian.org: Miriam Gideon (October 23rd, 1906 - June 18th, 1996) gigault.debian.org: Nicolas Gigault (ca. 1627 - August 20th, 1707) - glinka.debian.org: Mikhail Ivanovich Glinka (1804 - 1857) gombert.debian.org: Nicolas Gombert (c. 1495 - c. 1560) gretchaninov: Alexander Tikhonovich Gretchaninov (October 25th, 1864 - January 3rd, 1956) handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759) diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb index ae6d003b3..954d91fd6 100644 --- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb +++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb @@ -21,17 +21,4 @@ blacklist { } } multipaths { - # glinka - multipath { - wwid 3600c0ff000d5f6bdf0eaa45101000000 - alias r10-glinka - } - multipath { - wwid 3600c0ff000d5f6bdf1eaa45101000000 - alias r10-glinka-srv - } - multipath { - wwid 3600c0ff000d5f6bd866d4c5101000000 - alias r6-glinka-mirrors - } } diff --git a/modules/nfs-server/manifests/init.pp b/modules/nfs-server/manifests/init.pp index c44838ddc..7021ef330 100644 --- a/modules/nfs-server/manifests/init.pp +++ b/modules/nfs-server/manifests/init.pp @@ -26,9 +26,6 @@ class nfs-server { buxtehude: { $client_range = '(172.29.40.0/22 206.12.19.126/32)' } - glinka: { - $client_range = '(209.87.16.37/32 209.87.16.38/32)' - } gretchaninov: { $client_range = '172.29.40.0/22' } -- 2.20.1