Setup aagaard/acker as a ganeti cluster

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index a01c7c3..fa4da4f 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -53,7 +53,7 @@ node default {
                }
        }
 
-       if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10] {
+       if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,aagaard,acker] {
                include ganeti2
        }
 

diff --git a/modules/dsa_lvm/manifests/init.pp b/modules/dsa_lvm/manifests/init.pp
index c400157..a93ba1e 100644 (file)
--- a/modules/dsa_lvm/manifests/init.pp
+++ b/modules/dsa_lvm/manifests/init.pp
@@ -24,6 +24,9 @@ class dsa_lvm {
                'ubc-enc2bl01','ubc-enc2bl02','ubc-enc2bl09','ubc-enc2bl10': {
                        $conffile = 'lvm-ubc-ganeti2.conf'
                }
+               'aagaard','acker': {
+                       $conffile = 'lvm-conova-ganeti.conf'
+               }
                default: {
                        $conffile = ''
                }

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index 780c056..7740b12 100644 (file)
--- a/modules/ganeti2/manifests/params.pp
+++ b/modules/ganeti2/manifests/params.pp
@@ -43,6 +43,11 @@ class ganeti2::params {
                        $ganeti_priv  = ['172.29.175.0/24']
                        $drbd         = true
                }
+               'ganeti-conova.debian.org': {
+                       $ganeti_hosts = ['217.196.149.227/32', '217.196.149.228/32']
+                       $ganeti_priv  = ['172.29.184.11/32', '172.29.184.12/32']
+                       $drbd         = true
+               }
                default: {
                        $ganeti_hosts = []
                        $ganeti_priv  = []