From: Martin Zobel-Helas Date: Tue, 5 Mar 2013 16:27:49 +0000 (+0100) Subject: get cluster information from hiera X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=33360bb9cae387e8d38fbc3645031cdff09d0f44 get cluster information from hiera Signed-off-by: Martin Zobel-Helas --- diff --git a/hieradata/man-da.yaml b/hieradata/man-da.yaml index 7dce983e..a1012ba9 100644 --- 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 c8cc01ea..27990a14 100644 --- 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 924b187d..6cd63be1 100644 --- 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 4877c41e..e9999fbc 100644 --- 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']