From 09a4b91b3afe4bc9a768731b99dc057422117d5f Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Wed, 1 Jan 2014 15:27:33 +0100 Subject: [PATCH] Start moving bits from local.yaml to hiera --- hieradata/common.yaml | 3 +++ modules/debian-org/misc/local.yaml | 1 - modules/roles/manifests/init.pp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index f1507d9a..b6a90057 100644 --- 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 0a36a2e6..22d742d8 100644 --- 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 5ff27291..38572402 100644 --- 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 } -- 2.39.2