From 757d7fa5bf8750f0f94abeff5c9a7283c72ccb00 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Wed, 18 Dec 2013 13:34:26 -0800
Subject: [PATCH] Remove old logstash worker nodes

Change-Id: If67bf7ce363a8db500fc893dc38f7f4f46bda3f5
---
 manifests/site.pp                            | 16 ----------------
 modules/openstack_project/manifests/cacti.pp |  8 --------
 2 files changed, 24 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index fd887e76f5..1d2f3c357b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -291,14 +291,6 @@ node 'logstash.openstack.org' {
     sysadmins                       => hiera('sysadmins'),
     elasticsearch_nodes             => $elasticsearch_nodes,
     gearman_workers                 => [
-      'logstash-worker1.openstack.org',
-      'logstash-worker2.openstack.org',
-      'logstash-worker3.openstack.org',
-      'logstash-worker4.openstack.org',
-      'logstash-worker5.openstack.org',
-      'logstash-worker6.openstack.org',
-      'logstash-worker7.openstack.org',
-      'logstash-worker8.openstack.org',
       'logstash-worker01.openstack.org',
       'logstash-worker02.openstack.org',
       'logstash-worker03.openstack.org',
@@ -348,14 +340,6 @@ node /^elasticsearch\d*\.openstack\.org$/ {
     elasticsearch_nodes   => $elasticsearch_nodes,
     elasticsearch_clients => [
       'logstash.openstack.org',
-      'logstash-worker1.openstack.org',
-      'logstash-worker2.openstack.org',
-      'logstash-worker3.openstack.org',
-      'logstash-worker4.openstack.org',
-      'logstash-worker5.openstack.org',
-      'logstash-worker6.openstack.org',
-      'logstash-worker7.openstack.org',
-      'logstash-worker8.openstack.org',
       'logstash-worker01.openstack.org',
       'logstash-worker02.openstack.org',
       'logstash-worker03.openstack.org',
diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index c1d709c94f..9afb24402b 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/modules/openstack_project/manifests/cacti.pp
@@ -79,14 +79,6 @@ class openstack_project::cacti (
     'jenkins-dev.openstack.org',
     'lists.openstack.org',
     'logstash.openstack.org',
-    'logstash-worker1.openstack.org',
-    'logstash-worker2.openstack.org',
-    'logstash-worker3.openstack.org',
-    'logstash-worker4.openstack.org',
-    'logstash-worker5.openstack.org',
-    'logstash-worker6.openstack.org',
-    'logstash-worker7.openstack.org',
-    'logstash-worker8.openstack.org',
     'logstash-worker01.openstack.org',
     'logstash-worker02.openstack.org',
     'logstash-worker03.openstack.org',