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 7dce983e9355969918866b4708a968e0da77e40f..a1012ba97c722eec5395d0a4300c5b802befa80a 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 c8cc01ea4cf057de8024042da0dc894a3ef58818..27990a14252268d0b6786930d43e0228bff2bac5 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 924b187de96f191df8487822540e429152bcf1e6..6cd63be1548dc7bd5f195d4ae56e33bc8b14b1ef 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 4877c41eb67567313d33b3d94a367a34e49f84d9..e9999fbc86c8a1a323a23e661d6f74b01d312e84 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']