wheezy

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

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index bacb78cf91b704722162e6e369c952cb494d6c3c..743a29d51a68ff1061c6caf0249c099a9ee7a1bc 100644 (file)
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -30,6 +30,9 @@ class ganeti2 {
                '/etc/ganeti/instance-debootstrap/variants/dsa.conf':
                        content => template('ganeti2/instance-debootstrap/variants/dsa.conf.erb'),
                        ;
                '/etc/ganeti/instance-debootstrap/variants/dsa.conf':
                        content => template('ganeti2/instance-debootstrap/variants/dsa.conf.erb'),
                        ;

+               '/etc/ganeti/instance-debootstrap/variants/dsa-wheezy.conf':
+                       content => template('ganeti2/instance-debootstrap/variants/dsa-wheezy.conf.erb'),
+                       ;

                '/etc/ganeti/instance-debootstrap/hooks/00-dsa-configure-networking':
                        content => template('ganeti2/instance-debootstrap/hooks/00-dsa-configure-networking.erb'),
                        mode   => '0555',
                '/etc/ganeti/instance-debootstrap/hooks/00-dsa-configure-networking':
                        content => template('ganeti2/instance-debootstrap/hooks/00-dsa-configure-networking.erb'),
                        mode   => '0555',

diff --git a/modules/ganeti2/templates/instance-debootstrap/variants.list.erb b/modules/ganeti2/templates/instance-debootstrap/variants.list.erb
index 58de0a21fb8810575509b7199540e5abef5e343a..0e6f5b4a48f2ba798704d0ecfdf6b7c2a320913e 100644 (file)
--- a/modules/ganeti2/templates/instance-debootstrap/variants.list.erb
+++ b/modules/ganeti2/templates/instance-debootstrap/variants.list.erb
@@ -1,2 +1,3 @@
 default
 dsa
 default
 dsa

+dsa-wheezy

diff --git a/modules/ganeti2/templates/instance-debootstrap/variants/dsa-wheezy.conf.erb b/modules/ganeti2/templates/instance-debootstrap/variants/dsa-wheezy.conf.erb
new file mode 100644 (file)
index 0000000..6a76b9e
--- /dev/null
+++ b/modules/ganeti2/templates/instance-debootstrap/variants/dsa-wheezy.conf.erb
@@ -0,0 +1,10 @@
+<%=
+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
+%>
+ARCH="amd64"
+SUITE="wheezy"