From 377f3bb085ad2461d1d47354bcee601d7e8db183 Mon Sep 17 00:00:00 2001 From: Dmitrii Sutiagin Date: Fri, 20 Oct 2017 16:42:48 -0700 Subject: [PATCH] Fix: scripts_all_pairs does not trigger archive Change-Id: I46b41fdfdd13d7039521c5d19f90f558ae2ad944 --- specs/python-timmy.spec | 5 ++++- timmy/env.py | 2 +- timmy/nodes.py | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/specs/python-timmy.spec b/specs/python-timmy.spec index c9fea16..992657a 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.11 +Version: 1.26.12 Release: 1%{?dist}~mos0 Summary: Log collector tool for OpenStack Fuel @@ -107,6 +107,9 @@ popd %changelog +* Fri Oct 20 2017 Dmitry Sutyagin - 1.26.12 +- Fix: scripts_all_pairs does not trigger archive + * Wed Mar 22 2017 Dmitrii Kabanov - 1.26.11 - Change: prepend conf.env_vars to scripts with env vars diff --git a/timmy/env.py b/timmy/env.py index c57f306..dcbd7c0 100644 --- a/timmy/env.py +++ b/timmy/env.py @@ -16,7 +16,7 @@ # under the License. project_name = 'timmy' -version = '1.26.11' +version = '1.26.12' if __name__ == '__main__': import sys diff --git a/timmy/nodes.py b/timmy/nodes.py index 5197695..389c0b1 100644 --- a/timmy/nodes.py +++ b/timmy/nodes.py @@ -34,13 +34,14 @@ import shutil class Node(object): ckey = 'cmds' skey = 'scripts' + sapkey = 'scripts_all_pairs' fkey = 'files' flkey = 'filelists' lkey = 'logs' pkey = 'put' - conf_actionable = [lkey, ckey, skey, fkey, flkey, pkey] + conf_actionable = [lkey, ckey, skey, fkey, flkey, pkey, sapkey] conf_appendable = [lkey, ckey, skey, fkey, flkey, pkey] - conf_archive_general = [ckey, skey, fkey, flkey] + conf_archive_general = [ckey, skey, fkey, flkey, sapkey] conf_keep_default = [skey, ckey, fkey, flkey] conf_once_prefix = 'once_' conf_match_prefix = 'by_'