From 4300eaa7652ec8fe889c2da0d7ce83d25d967d08 Mon Sep 17 00:00:00 2001 From: Dmitrii Kabanov Date: Wed, 22 Mar 2017 18:20:18 -0700 Subject: [PATCH] Change: prepend conf.env_vars to scripts with env vars Fix SPT after Change-Id: I4f61e0ac061263d249bfa210cc5f165fbfee2471 Change-Id: I1fb4021f8bc2fe5fd2a27df4a7ce8f26c3329a0f --- specs/python-timmy.spec | 5 ++++- timmy/env.py | 2 +- timmy/nodes.py | 5 ++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/specs/python-timmy.spec b/specs/python-timmy.spec index d545aa2..c9fea16 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.10 +Version: 1.26.11 Release: 1%{?dist}~mos0 Summary: Log collector tool for OpenStack Fuel @@ -107,6 +107,9 @@ popd %changelog +* Wed Mar 22 2017 Dmitrii Kabanov - 1.26.11 +- Change: prepend conf.env_vars to scripts with env vars + * Mon Mar 20 2017 Dmitrii Kabanov - 1.26.10 - Change: use environment variable for openrc in SPT diff --git a/timmy/env.py b/timmy/env.py index 01bb203..c57f306 100644 --- a/timmy/env.py +++ b/timmy/env.py @@ -16,7 +16,7 @@ # under the License. project_name = 'timmy' -version = '1.26.10' +version = '1.26.11' if __name__ == '__main__': import sys diff --git a/timmy/nodes.py b/timmy/nodes.py index 89f3338..5197695 100644 --- a/timmy/nodes.py +++ b/timmy/nodes.py @@ -199,11 +199,10 @@ class Node(object): def generate_mapscr(self): mapscr = {} for scr in self.scripts: + env_vars = ' '.join(self.env_vars) if type(scr) is dict: - env_vars = scr.values()[0] + env_vars += ' %s' % scr.values()[0] scr = scr.keys()[0] - else: - env_vars = self.env_vars if os.path.sep in scr: script_path = scr else: