From df11d54a271217ab177aab7e1fac339a8478e130 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 25 May 2013 14:01:11 +0200 Subject: [PATCH] prepare to add salieri to ganeti2 --- hieradata/clusters/ganeti2.debian.org.yaml | 1 + manifests/site.pp | 6 ++---- modules/ferm/templates/me.conf.erb | 2 +- modules/ganeti2/manifests/params.pp | 4 ++-- modules/lvm/manifests/init.pp | 2 +- modules/multipath/manifests/init.pp | 2 +- .../templates/obsolete-packages-ignore.d-hostspecific.erb | 1 - 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml index 9963682a..2487733e 100644 --- a/hieradata/clusters/ganeti2.debian.org.yaml +++ b/hieradata/clusters/ganeti2.debian.org.yaml @@ -5,5 +5,6 @@ nodes: - 'bertali.debian.org' - 'boito.debian.org' - 'rossini.debian.org' + - 'salieri.debian.org' - 'dijkstra.debian.org' - 'luchesi.debian.org' diff --git a/manifests/site.pp b/manifests/site.pp index 7b1af9a5..8e4a77ac 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -38,14 +38,12 @@ node default { include bacula::client include autofs include lvm + include multipath - if $::hostname in [pasquini,tristano,bertali,boito,rossini,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] { + if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] { include ganeti2 } - if $::hostname in [bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,rossini,luchesi,dijkstra] { - include multipath - } if $::hostname == 'dinis' { include bacula::director diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index 86ee1560..69b8fa5d 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -7,7 +7,7 @@ out = [] restricted_purposes = {'kvm host', 'central syslog server', 'puppet master', 'jumphost'} -restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder rossini draghi} +restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder draghi} if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose')) then scope.lookupvar('site::nodeinfo')['ldap']['purpose'].each do |purp| diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp index 975b3d68..93414b75 100644 --- a/modules/ganeti2/manifests/params.pp +++ b/modules/ganeti2/manifests/params.pp @@ -6,8 +6,8 @@ class ganeti2::params { $drbd = false } 'ganeti2.debian.org': { - $ganeti_hosts = ['206.12.19.213/32', '206.12.19.217/32', '206.12.19.212/32', '206.12.19.216/32', '206.12.19.19/32', '206.12.19.218/32', '206.12.19.214/32'] - $ganeti_priv = ['192.168.2.213/32', '192.168.2.217/32', '192.168.2.212/32', '192.168.2.216/32', '192.168.2.19/32', '192.168.2.218/32', '192.168.2.214/32'] + $ganeti_hosts = ['206.12.19.213/32', '206.12.19.217/32', '206.12.19.212/32', '206.12.19.216/32', '206.12.19.19/32', '206.12.19.20/32', '206.12.19.218/32', '206.12.19.214/32'] + $ganeti_priv = ['192.168.2.213/32', '192.168.2.217/32', '192.168.2.212/32', '192.168.2.216/32', '192.168.2.19/32', '192.168.2.20/32', '192.168.2.218/32', '192.168.2.214/32'] $drbd = true } 'ganeti3.debian.org': { diff --git a/modules/lvm/manifests/init.pp b/modules/lvm/manifests/init.pp index 585efc47..b592d6ac 100644 --- a/modules/lvm/manifests/init.pp +++ b/modules/lvm/manifests/init.pp @@ -1,6 +1,6 @@ class lvm { case $::hostname { - dijkstra,luchesi,rossini: { + dijkstra,luchesi,rossini,salieri: { $conffile = 'lvm-ubc-ganeti.conf' } default: { diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp index cb5d02ea..1262ea18 100644 --- a/modules/multipath/manifests/init.pp +++ b/modules/multipath/manifests/init.pp @@ -3,7 +3,7 @@ class multipath { bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14: { $conffile = 'multipath-bm.conf' } - dijkstra,luchesi,rossini: { + dijkstra,luchesi,rossini,salieri: { $conffile = 'multipath-ubc-ganeti.conf' } default: { diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb index d0f2b2d8..f50eef92 100644 --- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb +++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb @@ -14,7 +14,6 @@ when /(zandonai|zelenka).debian.org/: ignore << %w{samhain zabbix-agent rrdcol when /zappa.debian.org/: ignore << %w{samhain} when /(mayer|corelli).debian.org/: ignore << "linux-base" when /(alkman|caballero|merulo|mundy).debian.org/: ignore << "samhain" -when "rossini.debian.org": ignore << %w{ganeti2} when "franck.debian.org": ignore << %w{python-apt} when /(abel|arnold|alain|alwyn|antheil|arne).debian.org/: ignore << %w{flash-kernel linux-firmware-image} when /harris.debian.org/: ignore << %w{flash-kernel kernel linux-firmware-image} -- 2.39.2