From: Stephen Gran Date: Thu, 2 Jan 2014 21:37:23 +0000 (+0000) Subject: move more to roles X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=8c8639e7e56bc223b3c45d38121c4c791d9c1df1 move more to roles Signed-off-by: Stephen Gran --- diff --git a/hieradata/common.yaml b/hieradata/common.yaml index bad77e56..f55e4830 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -58,6 +58,22 @@ roles: - soler.debian.org sso: - diabelli.debian.org + static_master: + - bizet.debian.org + - dillon.debian.org + - franck.debian.org + static_mirror: + - busoni.debian.org + - klecker.debian.org + - senfter.debian.org + static_source: + - master.debian.org + - dillon.debian.org + - franck.debian.org + - philp.debian.org + - ravel.debian.org + - senfl.debian.org + - wolkenstein.debian.org syncproxy: - milanollo.debian.org udd: @@ -66,6 +82,10 @@ roles: - vento.debian.org weblog_destination: - ravel.debian.org + weblog_provider: + - busoni.debian.org + - klecker.debian.org + - senfter.debian.org wiki: - wilder.debian.org www_master: diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index b3cc7946..be6e920c 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -305,26 +305,6 @@ host_settings: - czerny.debian.org - rautavaara.debian.org - salieri.debian.org - static_master: - - bizet.debian.org - - dillon.debian.org - - franck.debian.org - static_mirror: - - busoni.debian.org - - klecker.debian.org - - senfter.debian.org - static_source: - - master.debian.org - - dillon.debian.org - - franck.debian.org - - philp.debian.org - - ravel.debian.org - - senfl.debian.org - - wolkenstein.debian.org - weblog_provider: - - busoni.debian.org - - klecker.debian.org - - senfter.debian.org buildd_master: - grieg.debian.org - wuiet.debian.org