add ganeti3 cluster

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/manifests/site.pp b/manifests/site.pp
index e30db067c6d1c81abae0f709cc75a1e80ff3522c..29f9d5aa49d9e940aec00b60a6511da4ef68cccc 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,7 +37,7 @@ node default {
        include unbound
        include bacula::client
 
        include unbound
        include bacula::client
 

-       if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {

                include ganeti2
        }
 
                include ganeti2
        }
 

diff --git a/modules/ganeti2/templates/instance-debootstrap/hooks/00-dsa-configure-networking.erb b/modules/ganeti2/templates/instance-debootstrap/hooks/00-dsa-configure-networking.erb
index ec79eafecdf4589b13d63ea569717305af9d5472..e06ecfff0de90688f137b32d09341188fb385e03 100755 (executable)
--- a/modules/ganeti2/templates/instance-debootstrap/hooks/00-dsa-configure-networking.erb
+++ b/modules/ganeti2/templates/instance-debootstrap/hooks/00-dsa-configure-networking.erb
@@ -95,6 +95,31 @@ nameserver 140.211.166.130
 nameserver 140.211.166.131
 EOF
 
 nameserver 140.211.166.131
 EOF
 

+<% elsif scope.lookupvar('::cluster').to_s == 'ganeti3.debian.org' -%>
+#
+###########################################
+if [ "$NIC_COUNT" -ge 1 ]; then
+  cat >> $TARGET/etc/network/interfaces << EOF
+auto eth0
+iface eth0 inet static
+  address ${NIC_0_IP}
+  netmask 255.255.255.192
+  gateway 82.195.75.126
+
+  pre-up /sbin/sysctl -w net.ipv6.conf.\$IFACE.accept_ra=0 || true
+EOF
+
+fi
+
+###########################################
+cat > $TARGET/etc/resolv.conf <<EOF
+# /etc/resolv.conf
+search debian.org
+nameserver 82.195.75.81
+nameserver 82.195.66.239
+nameserver 217.198.242.225
+EOF
+

 <% else -%>
 
 # No config for cluster <%= scope.lookupvar('::cluster').to_s %>
 <% else -%>
 
 # No config for cluster <%= scope.lookupvar('::cluster').to_s %>

diff --git a/modules/ganeti2/templates/instance-debootstrap/variants/dsa.conf.erb b/modules/ganeti2/templates/instance-debootstrap/variants/dsa.conf.erb
index bea25676cd50b98122324ee3e9b3e107c2985f41..61e8a200c925817449e515a8a1eedcf638703a47 100644 (file)
--- a/modules/ganeti2/templates/instance-debootstrap/variants/dsa.conf.erb
+++ b/modules/ganeti2/templates/instance-debootstrap/variants/dsa.conf.erb
@@ -2,6 +2,7 @@
 case scope.lookupvar('::cluster')
         when "ganeti2.debian.org" then 'MIRROR="http://mirror-ubc.debian.org/debian"'
         when "ganeti-osuosl.debian.org" then 'MIRROR="http://debian.osuosl.org/debian"'
 case scope.lookupvar('::cluster')
         when "ganeti2.debian.org" then 'MIRROR="http://mirror-ubc.debian.org/debian"'
         when "ganeti-osuosl.debian.org" then 'MIRROR="http://debian.osuosl.org/debian"'

+       when "ganeti3.debian.org" then 'MIRROR="http://mirror.ayous.org/debian"'

         else 'MIRROR="http://http.debian.net/debian"'
 end
 %>
         else 'MIRROR="http://http.debian.net/debian"'
 end
 %>