From: Martin Zobel-Helas Date: Fri, 12 Apr 2013 12:25:16 +0000 (+0200) Subject: add ganeti-bytemark X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=b3b09b4852bd2f5c87883ae7ec63f4571ec0c928 add ganeti-bytemark Signed-off-by: Martin Zobel-Helas --- diff --git a/hieradata/clusters/ganeti-bytemark.debian.org.yaml b/hieradata/clusters/ganeti-bytemark.debian.org.yaml new file mode 100644 index 00000000..ce906c38 --- /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 df413db9..29a5d011 100644 --- 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 6a76b9ee..26b6ff9a 100644 --- 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 61e8a200..affb9732 100644 --- 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 %>