From 23b709cd5502305b328e3487c1a48042bf7d98fa Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 22 May 2013 20:46:15 +0200 Subject: [PATCH] dijkstra to ganeti2 --- hieradata/clusters/ganeti2.debian.org.yaml | 1 + manifests/site.pp | 2 +- modules/ganeti2/manifests/params.pp | 4 ++-- modules/samhain/templates/samhainrc.erb | 3 --- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml index ecad271d..4b5758e3 100644 --- a/hieradata/clusters/ganeti2.debian.org.yaml +++ b/hieradata/clusters/ganeti2.debian.org.yaml @@ -5,3 +5,4 @@ nodes: - 'bertali.debian.org' - 'boito.debian.org' - 'rossini.debian.org' + - 'dijkstra.debian.org' diff --git a/manifests/site.pp b/manifests/site.pp index 61404a5c..6461585b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -38,7 +38,7 @@ node default { include bacula::client include autofs - if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny,rossini,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,dijkstra,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 } diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp index e28ce237..8a64328c 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'] - $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'] + $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'] + $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.18/32'] $drbd = true } 'ganeti3.debian.org': { diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 4ab85dc9..6a2517f1 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -420,9 +420,6 @@ dir=1/etc/bind/geodns dir=1/etc/bind file=/etc/bind/named.conf.debian-zones <% end -%> -<% if scope.lookupvar('::fqdn') == "dijkstra.debian.org" -%> -dir=4/etc/dsa-kvm -<% end -%> <% if scope.lookupvar('site::nodeinfo')['buildd'] -%> dir=3/etc/lvm <% end -%> -- 2.39.2