grnet ganeti hosts

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index 0c741f4a1e703bea2fc20e901cf53be084f6b4b6..2c72c13d679801f9b48857473cc23bbc623d5594 100644 (file)
--- 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 0f43639536957e52772f92ed0d2a64ecc5bf113b..35d976841dd59c49a006aced6ba02bbc21ef12ef 100644 (file)
--- 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 16367ab23ec2fc506ccb2670eb1bf429c2a0fe46..c2d7e9eef5da7eabe65e85cbf0092ba82ab939a8 100644 (file)
--- 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")