add ganeti-bytemark

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

diff --git a/hieradata/clusters/ganeti-bytemark.debian.org.yaml b/hieradata/clusters/ganeti-bytemark.debian.org.yaml
new file mode 100644 (file)
index 0000000..ce906c3
--- /dev/null
+++ b/hieradata/clusters/ganeti-bytemark.debian.org.yaml
@@ -0,0 +1,4 @@
+---
+nodes:
+  - 'bm-bl1.debian.org'
+  - 'bm-bl9.debian.org'

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index df413db94efefd06f83b22daa237a4058bdc17c5..29a5d011250682aa956c2a72f43e148cc43f2198 100644 (file)
--- a/modules/ganeti2/manifests/params.pp
+++ b/modules/ganeti2/manifests/params.pp
@@ -17,6 +17,11 @@ class ganeti2::params {
                        $ganeti_priv  = ['192.168.75.103/32', '192.168.75.109/32']
                        $drbd         = true
                }
+               'ganeti-bytemark.debian.org': {
+                       $ganeti_hosts = ['5.153.231.1/32', '5.153.231.9/32']
+                       $ganeti_priv  = ['192.168.231.1/32', '192.168.231.9/32']
+                       $drbd         = false
+               }
                default: {
                        $ganeti_hosts = []
                        $ganeti_priv  = []

diff --git a/modules/ganeti2/templates/instance-debootstrap/variants/dsa-wheezy.conf.erb b/modules/ganeti2/templates/instance-debootstrap/variants/dsa-wheezy.conf.erb
index 6a76b9ee17dbd7628a72681e70b4570decaa7710..26b6ff9a9167e3fa39d285101772dde475a10cf1 100644 (file)
--- a/modules/ganeti2/templates/instance-debootstrap/variants/dsa-wheezy.conf.erb
+++ b/modules/ganeti2/templates/instance-debootstrap/variants/dsa-wheezy.conf.erb
@@ -3,6 +3,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"'
        when "ganeti3.debian.org" then 'MIRROR="http://mirror.ayous.org/debian"'
+       when "ganeti-bytemark.debian.org" then 'MIRROR="http://mirror.bytemark.co.uk/debian"'
         else 'MIRROR="http://http.debian.net/debian"'
 end
 %>

diff --git a/modules/ganeti2/templates/instance-debootstrap/variants/dsa.conf.erb b/modules/ganeti2/templates/instance-debootstrap/variants/dsa.conf.erb
index 61e8a200c925817449e515a8a1eedcf638703a47..affb9732f5ee01d2ff576a79825cf9bf629daabe 100644 (file)
--- a/modules/ganeti2/templates/instance-debootstrap/variants/dsa.conf.erb
+++ b/modules/ganeti2/templates/instance-debootstrap/variants/dsa.conf.erb
@@ -3,6 +3,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"'
        when "ganeti3.debian.org" then 'MIRROR="http://mirror.ayous.org/debian"'
+       when "ganeti-bytemark.debian.org" then 'MIRROR="http://mirror.bytemark.co.uk/debian"'
         else 'MIRROR="http://http.debian.net/debian"'
 end
 %>