x/timmy
Code Issues Proposed changes

Change: prepend conf.env_vars to scripts with env vars

Browse Source 
Fix SPT after Change-Id: I4f61e0ac061263d249bfa210cc5f165fbfee2471

Change-Id: I1fb4021f8bc2fe5fd2a27df4a7ce8f26c3329a0f
This commit is contained in:
Dmitrii Kabanov 2017-03-22 18:20:18 -07:00
parent 39b8aa8b96
commit 4300eaa765
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
specs/python-timmy.spec
View File

@ -4,7 +4,7 @@
%global pypi_name timmy %global pypi_name timmy
Name: python-%{pypi_name} Name: python-%{pypi_name}
Version: 1.26.10 Version: 1.26.11
Release: 1%{?dist}~mos0 Release: 1%{?dist}~mos0
Summary: Log collector tool for OpenStack Fuel Summary: Log collector tool for OpenStack Fuel
@ -107,6 +107,9 @@ popd
%changelog %changelog
* Wed Mar 22 2017 Dmitrii Kabanov <dkabanov@mirantis.com> - 1.26.11
- Change: prepend conf.env_vars to scripts with env vars
* Mon Mar 20 2017 Dmitrii Kabanov <dkabanov@mirantis.com> - 1.26.10 * Mon Mar 20 2017 Dmitrii Kabanov <dkabanov@mirantis.com> - 1.26.10
- Change: use environment variable for openrc in SPT - Change: use environment variable for openrc in SPT

2
timmy/env.py
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
project_name = 'timmy' project_name = 'timmy'
version = '1.26.10' version = '1.26.11'
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys

5
timmy/nodes.py
View File

@ -199,11 +199,10 @@ class Node(object):
def generate_mapscr(self): def generate_mapscr(self):
mapscr = {} mapscr = {}
for scr in self.scripts: for scr in self.scripts:
env_vars = ' '.join(self.env_vars)
if type(scr) is dict: if type(scr) is dict:
env_vars = scr.values()[0] env_vars += ' %s' % scr.values()[0]
scr = scr.keys()[0] scr = scr.keys()[0]
else:
env_vars = self.env_vars
if os.path.sep in scr: if os.path.sep in scr:
script_path = scr script_path = scr
else: else: