Developers Reference migrated to Sphinx and changed back to old names, update the...

[mirror/dsa-puppet.git] / modules / ganeti2 / manifests / params.pp

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index e76bc96..b5df78c 100644 (file)
--- a/modules/ganeti2/manifests/params.pp
+++ b/modules/ganeti2/manifests/params.pp
@@ -15,14 +15,16 @@ class ganeti2::params {
                        $ganeti_priv  = ['140.211.166.20/32']
                        $drbd         = false
                }
-               'ganeti3.debian.org': {
-                       $ganeti_hosts = ['82.195.75.103/32', '82.195.75.109/32']
-                       $ganeti_priv  = ['192.168.75.103/32', '192.168.75.109/32']
+               'ganeti2-osuosl.debian.org': {
+                       $ganeti_hosts = getfromhash($deprecated::allnodeinfo, 'pijper.debian.org', 'ipHostNumber') +
+                                       getfromhash($deprecated::allnodeinfo, 'pieta.debian.org', 'ipHostNumber')
+                       $ganeti_priv  = getfromhash($deprecated::allnodeinfo, 'pijper.debian.org', 'ipHostNumber') +
+                                       getfromhash($deprecated::allnodeinfo, 'pieta.debian.org', 'ipHostNumber')
                        $drbd         = true
                }
                'ganeti.manda.debian.org': {
-                       $ganeti_hosts = getfromhash($site::allnodeinfo, 'manda-node03.debian.org', 'ipHostNumber') +
-                                       getfromhash($site::allnodeinfo, 'manda-node04.debian.org', 'ipHostNumber')
+                       $ganeti_hosts = getfromhash($deprecated::allnodeinfo, 'manda-node03.debian.org', 'ipHostNumber') +
+                                       getfromhash($deprecated::allnodeinfo, 'manda-node04.debian.org', 'ipHostNumber')
                        $ganeti_priv  = ['172.29.182.13', '172.29.182.14']
                        $drbd         = true
                }
@@ -51,6 +53,13 @@ class ganeti2::params {
                        $ganeti_priv  = ['172.29.184.11/32', '172.29.184.12/32']
                        $drbd         = true
                }
+               'ganeti3.ubc.debian.org': {
+                       $ganeti_hosts = getfromhash($deprecated::allnodeinfo, 'ubc-node-arm01.debian.org', 'ipHostNumber') +
+                                       getfromhash($deprecated::allnodeinfo, 'ubc-node-arm02.debian.org', 'ipHostNumber') +
+                                       getfromhash($deprecated::allnodeinfo, 'ubc-node-arm03.debian.org', 'ipHostNumber')
+                       $ganeti_priv  = ['172.29.42.51', '172.29.42.52', '172.29.42.53']
+                       $drbd         = true
+               }
                default: {
                        $ganeti_hosts = []
                        $ganeti_priv  = []