From cb0897914547274dbcccd197421595c14efc006f Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Tue, 8 Aug 2017 21:00:20 -0400
Subject: [PATCH] Fix nova-conductor log collection for superconductor mode

The devstack change in Pike to run nova-conductor in a tiered
"superconductor" mode by default creates a couple of different
log files for the top-level conductor service and the cell-level
conductor service, so we need to index those as well.

Depends-On: I44fc11f09bb7283be0b068f5e02a424f3e5dafe2

Change-Id: Ic828dd95520b21246d46a8087e8579fc3820f5c7
---
 .../files/logstash/jenkins-log-client.yaml            | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/openstack_project/files/logstash/jenkins-log-client.yaml b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
index b7b42d0919..7842b7fe8e 100644
--- a/modules/openstack_project/files/logstash/jenkins-log-client.yaml
+++ b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
@@ -192,10 +192,21 @@ source-files:
       - screen
       - oslofmt
     job-filter: '.*cells.*'
+  # Only nova-conductor in a singleconductor deployment.
   - name: logs/screen-n-cond.txt
     tags:
       - screen
       - oslofmt
+  # Top-level nova-conductor in a superconductor deployment.
+  - name: logs/screen-n-super-cond.txt
+    tags:
+      - screen
+      - oslofmt
+  # Cell-level conductor in a superconductor deployment.
+  - name: logs/screen-n-cond-cell1.txt
+    tags:
+      - screen
+      - oslofmt
   - name: logs/screen-n-cpu.txt
     tags:
       - screen