get cluster information from hiera

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

diff --git a/hieradata/man-da.yaml b/hieradata/man-da.yaml
index 7dce983..a1012ba 100644 (file)
--- a/hieradata/man-da.yaml
+++ b/hieradata/man-da.yaml
@@ -4,3 +4,4 @@ nameservers:
   - 217.198.242.225
 searchpaths:
   - debprivate-darmstadt.debian.org
+cluster: ganeti3.debian.org

diff --git a/hieradata/osuosl.yaml b/hieradata/osuosl.yaml
index c8cc01e..27990a1 100644 (file)
--- a/hieradata/osuosl.yaml
+++ b/hieradata/osuosl.yaml
@@ -3,3 +3,4 @@ nameservers:
   - 140.211.166.130
   - 140.211.166.131
   - 216.165.191.54
+cluster: ganeti-osuosl.debian.org

diff --git a/hieradata/ubcece.yaml b/hieradata/ubcece.yaml
index 924b187..6cd63be 100644 (file)
--- a/hieradata/ubcece.yaml
+++ b/hieradata/ubcece.yaml
@@ -8,3 +8,4 @@ nameservers:
   - 2607:f8f0:610:4000:21c:c4ff:fee5:e890
 searchpaths:
   - debprivate-ubc.debian.org
+cluster: ganeti2.debian.org

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index 4877c41..e9999fb 100644 (file)
--- a/modules/ganeti2/manifests/params.pp
+++ b/modules/ganeti2/manifests/params.pp
@@ -1,6 +1,7 @@
 class ganeti2::params {
-
-       case $::cluster {
+       
+       $cluster = hiera('cluster')
+       case $luster {
                'ganeti-osuosl.debian.org': {
                        $ganeti_hosts = ['140.211.166.20/32']
                        $ganeti_priv  = ['140.211.166.20/32']