openstack/openstack-helm-images
Code Issues Proposed changes

Change condition in define-host plugin

Browse Source 
This commit changes confdition in define-host plugin in order to
prevent failing with "KeyError: 'NODE_DOMAIN'" in case we do not
have such environment variable.

Change-Id: I030e3f01ca9d25f3946fd621635f422d3278f21e
This commit is contained in:
dmyrhorodskyi
2020-03-13 15:53:59 +02:00
parent 5eb530430b
commit c78298328e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nagios/plugins/define-nagios-hosts.py
View File

@@ -134,7 +134,7 @@ def get_nagios_hostgroups_dictionary(node_list):
nagios_hostgroups = {}
try:
for node in node_list:
if os.environ['NODE_DOMAIN']:
if 'NODE_DOMAIN' in os.environ:
node_name = "%s.%s" % (node.metadata.name, os.environ['NODE_DOMAIN'])
else:
node_name = node.metadata.name
@@ -155,7 +155,7 @@ def get_nagios_hosts(node_list):
try:
hostgroup_dictionary = get_nagios_hostgroups_dictionary(node_list)
for node in node_list:
if os.environ['NODE_DOMAIN']:
if 'NODE_DOMAIN' in os.environ:
host_name = "%s.%s" % (node.metadata.name, os.environ['NODE_DOMAIN'])
else:
host_name = node.metadata.name