From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 14 Jul 2013 11:52:14 +0000 (+0200)
Subject: merge two blocks of hosts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9d88cd69a884b075df186c2003514b9d8260f826;p=mirror%2Fdsa-puppet.git

merge two blocks of hosts
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 7c3c2c055..721e7d022 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -223,17 +223,21 @@ host_settings:
     - santoro.debian.org
     - senfl.debian.org
   not-bacula-client:
-    - cilea.debian.org
     - franck.debian.org
     - ravel.debian.org
     - ries.debian.org
     - sibelius.debian.org
     - stabile.debian.org
     # decommissioning
+    - cilea.debian.org
     - merikanto.debian.org
+    - morricone.debian.org
     - paganini.debian.org
     - rautavaara.debian.org
     - respighi.debian.org
+    - scelsi.debian.org
+    - unger.debian.org
+    - vitry.debian.org
     # dead/not running
     - berlioz.debian.org
     - coincy.debian.org
@@ -259,11 +263,6 @@ host_settings:
     - steffani.debian.org
     - villa.debian.org
     - wieck.debian.org
-    # pending cleanup/repurpose/decommission
-    - morricone.debian.org
-    - scelsi.debian.org
-    - unger.debian.org
-    - vitry.debian.org
     # kvm host
     - bertali.debian.org
     - bm-bl3.debian.org