dijkstra to ganeti2

diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml
index ecad271da60ba30dbd1042a03fb932338232e72b..4b5758e317fd9c799a298c74bbd491e4c7feb502 100644 (file)
--- 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 61404a5c8f91099f9778b4c4a1d4611e1412c1b0..6461585b34f3d6d24ac6e8a4e8a8016dd3ec5a6d 100644 (file)
--- 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 e28ce2375306a6a7cc24a9947d7e004a40b5e3a8..8a64328c2a18ad2470ebeba926f6fad3f218b287 100644 (file)
--- 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 4ab85dc9db1e93e4ce3b20b846ffa2a07a3d44e6..6a2517f11a39b2cd434444a807799e7b8ccdf411 100644 (file)
--- 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 -%>