From ff8faad8a4dabea6e924c337fe385c2a86ede843 Mon Sep 17 00:00:00 2001
From: Dmitry Sutyagin <dsutyagin@mirantis.com>
Date: Tue, 14 Mar 2017 18:31:11 -0700
Subject: [PATCH] Add: collect ceilometer & aodh config

Change-Id: I5fe6cc4e6777a83e64a22df108d6e6953922d37b
---
 specs/python-timmy.spec                | 6 +++++-
 timmy/env.py                           | 2 +-
 timmy_data/rq/default.yaml             | 4 +++-
 timmy_data/rq/filelists/etc-aodh       | 3 +++
 timmy_data/rq/filelists/etc-ceilometer | 3 +++
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 timmy_data/rq/filelists/etc-aodh
 create mode 100644 timmy_data/rq/filelists/etc-ceilometer

diff --git a/specs/python-timmy.spec b/specs/python-timmy.spec
index b59a907..693d71e 100644
--- a/specs/python-timmy.spec
+++ b/specs/python-timmy.spec
@@ -4,7 +4,7 @@
 %global pypi_name timmy
 
 Name:           python-%{pypi_name}
-Version:        1.26.8
+Version:        1.26.9
 Release:        1%{?dist}~mos0
 Summary:        Log collector tool for OpenStack Fuel
 
@@ -107,6 +107,10 @@ popd
 
 
 %changelog
+* Tue Mar 14 2017 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.9
+- Add: collect ceilometer & aodh config
+- Fix: add "fuel2 task list" for 10.x series
+
 * Fri Feb 24 2017 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.8
 - Fix: exec_pair trace; SPT bugs; print non-0 exit
 
diff --git a/timmy/env.py b/timmy/env.py
index 1c90fac..d05aa7f 100644
--- a/timmy/env.py
+++ b/timmy/env.py
@@ -16,7 +16,7 @@
 #    under the License.
 
 project_name = 'timmy'
-version = '1.26.8'
+version = '1.26.9'
 
 if __name__ == '__main__':
     import sys
diff --git a/timmy_data/rq/default.yaml b/timmy_data/rq/default.yaml
index e447fd8..c29a941 100644
--- a/timmy_data/rq/default.yaml
+++ b/timmy_data/rq/default.yaml
@@ -19,7 +19,9 @@ filelists:
       - 'etc-fuel'
       - 'etc-nailgun'
     controller:
+      - 'etc-aodh'
       - 'etc-apache2'
+      - 'etc-ceilometer'
       - 'etc-ceph'
       - 'etc-cinder'
       - 'etc-glance'
@@ -33,7 +35,7 @@ filelists:
     cinder: ['etc-cinder']
     cinder-block-device: ['etc-cinder']
     ceph-osd: ['root-ceph', 'etc-ceph']
-    compute: ['etc-libvirt', 'etc-nova']
+    compute: ['etc-ceilometer', 'etc-libvirt', 'etc-nova']
     ironic: ['etc-ironic']
     no_fuel: ['etc-hiera', 'etc-neutron']
     virt: ['etc-libvirt']
diff --git a/timmy_data/rq/filelists/etc-aodh b/timmy_data/rq/filelists/etc-aodh
new file mode 100644
index 0000000..6dd369a
--- /dev/null
+++ b/timmy_data/rq/filelists/etc-aodh
@@ -0,0 +1,3 @@
++ /etc
++ /etc/aodh
++ /etc/aodh/**
diff --git a/timmy_data/rq/filelists/etc-ceilometer b/timmy_data/rq/filelists/etc-ceilometer
new file mode 100644
index 0000000..ba5df70
--- /dev/null
+++ b/timmy_data/rq/filelists/etc-ceilometer
@@ -0,0 +1,3 @@
++ /etc
++ /etc/ceilometer
++ /etc/ceilometer/**