x/timmy
Code Issues Proposed changes

Fix: incorrect logic in NodeManager __init__

Browse Source 
Change-Id: I2ecd6dbcfc0131211277c096d56c3034c54ed069
This commit is contained in:
Dmitry Sutyagin 2016-09-14 12:32:28 +03:00
parent 111dfebe07
commit a4fed99239
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
timmy/env.py
View File

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

15
timmy/nodes.py
View File

@ -598,20 +598,19 @@ class NodeManager(object):
not self.get_release_api() and
not self.get_release_cli()):
self.logger.warning('could not get Fuel and MOS versions')
# apply soft-filter on all nodes
# fallbacks
self.nodes_get_roles_hiera()
self.nodes_get_os()
self.nodes_get_cluster_ids()
for node in self.nodes.values():
# apply soft-filter on all nodes
if not self.filter(node, self.conf['soft_filter']):
node.filtered_out = True
if self.conf['logs_exclude_filtered']:
self.logs_excluded_nodes.append(node.fqdn)
self.logs_excluded_nodes.append(node.ip)
else:
if self.nodes_json:
self.nodes_get_roles_hiera()
self.nodes_get_os()
self.nodes_get_cluster_ids()
self.nodes_reapply_conf()
self.conf_assign_once()
self.nodes_reapply_conf()
self.conf_assign_once()
os.environ = environ
def __str__(self):