Start moving bits from local.yaml to hiera

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f1507d9aab8190ec17bf52fe3f0f1dccd2b8da0b..b6a900576a46e7c5d65716c78fb5bbeb38bc66c4 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -3,3 +3,6 @@ nameservers: []
 searchpaths: []
 resolvoptions: []
 allow_dns_query: []
+roles:
+  puppetmaster:
+    - handel.debian.org

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 0a36a2e6a49788b2eee1a7054fdb2bd900c77583..22d742d84184fe223d765163f03c5c1a8d475e16 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -177,7 +177,6 @@ services:
     - orff.debian.org
   packagesmaster: picconi.debian.org
   packagesqamaster: quantz.debian.org
-  puppetmaster: handel.debian.org
   rtmaster:
     - reger.debian.org
   security_master:

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 5ff272913b47e18fc7460390220aa2c626c837ec..38572402d4812b2ccb0d51d1214d7f41d513c000 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,6 +1,6 @@
 class roles {
 
-       if getfromhash($site::nodeinfo, 'puppetmaster') {
+       if $::hostname in hiera('roles::puppetmaster') {
                include puppetmaster
        }