From 6b1c661a1bf241e122e724dbdd2737d6d41ce2ae Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 3 May 2016 12:33:43 -0400
Subject: [PATCH] Remove devstack-centos7 logging for nodepool

Change-Id: I445abfccd10f532142a57cb754e7f7785ae091d3
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .../nodepool-builder.logging.conf.erb         | 64 ++-----------------
 1 file changed, 6 insertions(+), 58 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
index 9d695c69b6..5f062c171d 100644
--- a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
@@ -7,19 +7,15 @@
 
 [loggers]
 keys=root,nodepool,requests,shade,image,
- rax-dfw_bare-precise, rax-dfw_devstack-centos7, rax-ord_bare-precise,
- rax-ord_devstack-centos7, rax-iad_bare-precise,
- rax-iad_devstack-centos7, tripleo-test-cloud-rh1_tripleo-f22,
- dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial,
- dib_devstack-centos7, dib_centos-7, dib_fedora-23
+ rax-dfw_bare-precise, rax-ord_bare-precise, rax-iad_bare-precise,
+ tripleo-test-cloud-rh1_tripleo-f22, dib_debian-jessie,
+ dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7, dib_fedora-23
 
 [handlers]
 keys=console,debug,normal,image,
- rax-dfw_bare-precise, rax-dfw_devstack-centos7, rax-ord_bare-precise,
- rax-ord_devstack-centos7, rax-iad_bare-precise,
- rax-iad_devstack-centos7, tripleo-test-cloud-rh1_tripleo-f22,
- dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial,
- dib_devstack-centos7, dib_centos-7, dib_fedora-23
+ rax-dfw_bare-precise, rax-ord_bare-precise, rax-iad_bare-precise,
+ tripleo-test-cloud-rh1_tripleo-f22, dib_debian-jessie,
+ dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7, dib_fedora-23
 
 [formatters]
 keys=simple
@@ -92,18 +88,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-dfw.bare-precise.log', 'H', 8, 30,)
 
-[logger_rax-dfw_devstack-centos7]
-level=DEBUG
-handlers=rax-dfw_devstack-centos7
-qualname=nodepool.image.build.rax-dfw.devstack-centos7
-propagate=0
-
-[handler_rax-dfw_devstack-centos7]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-dfw.devstack-centos7.log', 'H', 8, 30,)
-
 [logger_rax-ord_bare-precise]
 level=DEBUG
 handlers=rax-ord_bare-precise
@@ -116,18 +100,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-ord.bare-precise.log', 'H', 8, 30,)
 
-[logger_rax-ord_devstack-centos7]
-level=DEBUG
-handlers=rax-ord_devstack-centos7
-qualname=nodepool.image.build.rax-ord.devstack-centos7
-propagate=0
-
-[handler_rax-ord_devstack-centos7]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-ord.devstack-centos7.log', 'H', 8, 30,)
-
 [logger_rax-iad_bare-precise]
 level=DEBUG
 handlers=rax-iad_bare-precise
@@ -140,18 +112,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-iad.bare-precise.log', 'H', 8, 30,)
 
-[logger_rax-iad_devstack-centos7]
-level=DEBUG
-handlers=rax-iad_devstack-centos7
-qualname=nodepool.image.build.rax-iad.devstack-centos7
-propagate=0
-
-[handler_rax-iad_devstack-centos7]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-iad.devstack-centos7.log', 'H', 8, 30,)
-
 [logger_tripleo-test-cloud-rh1_tripleo-f22]
 level=DEBUG
 handlers=tripleo-test-cloud-rh1_tripleo-f22
@@ -200,18 +160,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/dib.ubuntu-xenial.log', 'H', 8, 30,)
 
-[logger_dib_devstack-centos7]
-level=DEBUG
-handlers=dib_devstack-centos7
-qualname=nodepool.image.build.devstack-centos7
-propagate=0
-
-[handler_dib_devstack-centos7]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/dib.devstack-centos7.log', 'H', 8, 30,)
-
 [logger_dib_centos-7]
 level=DEBUG
 handlers=dib_centos-7