From 4f81eb9ecb1b401c3e67d01129f2ef1f06da4f30 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 10 Oct 2014 20:54:24 +0200 Subject: [PATCH] grnet ganeti hosts --- modules/ganeti2/manifests/params.pp | 5 +++++ modules/lvm/manifests/init.pp | 3 +++ .../templates/obsolete-packages-ignore.d-hostspecific.erb | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp index 0c741f4a..2c72c13d 100644 --- a/modules/ganeti2/manifests/params.pp +++ b/modules/ganeti2/manifests/params.pp @@ -33,6 +33,11 @@ class ganeti2::params { $ganeti_priv = ['172.29.178.0/24'] $drbd = true } + 'ganeti.grnet.debian.org': { + $ganeti_hosts = ['194.177.211.195/32', '194.177.211.196/32'] + $ganeti_priv = ['172.29.175.0/24'] + $drbd = true + } default: { $ganeti_hosts = [] $ganeti_priv = [] diff --git a/modules/lvm/manifests/init.pp b/modules/lvm/manifests/init.pp index 0f436395..35d97684 100644 --- a/modules/lvm/manifests/init.pp +++ b/modules/lvm/manifests/init.pp @@ -9,6 +9,9 @@ class lvm { csail-node01,csail-node02: { $conffile = 'lvm-csail-nodeX-ganeti.conf' } + grnet-node01,grnet-node02: { + $conffile = 'lvm-grnet-nodeX-ganeti.conf' + } default: { $conffile = '' } diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb index 16367ab2..c2d7e9ee 100644 --- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb +++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb @@ -25,7 +25,7 @@ when "zemlinsky.debian.org" then ignore << %w{init when "sibelius.debian.org" then ignore << %w{tivsm-ba tivsm-api64 gskssl64 gskcrypt64} when "vogler.debian.org" then ignore << %w{repro libresiprocate-1.9 resiprocate-turn-server} when /(mailly|muffat).debian.org/ then ignore << %w{python-dsa-mq} -when /csail-node(01|02).debian.org/ then ignore << %w{openvswitch-switch openvswitch-common} +when /(csail|grnet)-node(01|02).debian.org/ then ignore << %w{openvswitch-switch openvswitch-common} end case fqdn @@ -33,7 +33,7 @@ when /geo[123].debian.org/ then ignore << %w{geoip-database} end case fqdn -when /(csail-node(01|02)|powell|bm-bl1).debian.org/ then ignore << %w{ganeti-os-noop} +when /((csail|grnet)-node(01|02)|powell|bm-bl1).debian.org/ then ignore << %w{ganeti-os-noop} end ignore.flatten.join("\n") -- 2.39.2