summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@gmail.com>2015-09-11 13:02:28 -0400
committerMatt Woodson <mwoodson@gmail.com>2015-09-11 13:02:28 -0400
commitda9326c388c4e6ea68aa9d0df348db237602cc51 (patch)
treea3dba9451e7475b3c2ab121bf06bd7ed126ccaf1
parenta5011b9ad04c552a5fcda77d08cdb5fa77d40f01 (diff)
parent5adc02254b9eb4ac2e308104711eeec7e39b2c4e (diff)
downloadopenshift-da9326c388c4e6ea68aa9d0df348db237602cc51.tar.gz
openshift-da9326c388c4e6ea68aa9d0df348db237602cc51.tar.bz2
openshift-da9326c388c4e6ea68aa9d0df348db237602cc51.tar.xz
openshift-da9326c388c4e6ea68aa9d0df348db237602cc51.zip
Merge pull request #577 from kwoodson/tmp
Fixing a few zbx api issues to make idempotency work.
-rw-r--r--roles/lib_zabbix/library/zbx_item.py6
-rw-r--r--roles/lib_zabbix/library/zbx_user.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/lib_zabbix/library/zbx_item.py b/roles/lib_zabbix/library/zbx_item.py
index 11e3c7b2b..2ccc21292 100644
--- a/roles/lib_zabbix/library/zbx_item.py
+++ b/roles/lib_zabbix/library/zbx_item.py
@@ -92,7 +92,7 @@ def get_multiplier(inval):
''' Determine the multiplier
'''
if inval == None or inval == '':
- return None, None
+ return None, 0
rval = None
try:
@@ -101,9 +101,9 @@ def get_multiplier(inval):
pass
if rval:
- return rval, True
+ return rval, 1
- return rval, False
+ return rval, 0
# The branches are needed for CRUD and error handling
# pylint: disable=too-many-branches
diff --git a/roles/lib_zabbix/library/zbx_user.py b/roles/lib_zabbix/library/zbx_user.py
index c916fa96a..62c85c1bf 100644
--- a/roles/lib_zabbix/library/zbx_user.py
+++ b/roles/lib_zabbix/library/zbx_user.py
@@ -164,7 +164,7 @@ def main():
if key == 'usrgrps':
# this must be done as a list of ordered dictionaries fails comparison
- if not all([True for _ in zab_results[key][0] if _ in value[0]]):
+ if not all([_ in value for _ in zab_results[key]]):
differences[key] = value
elif zab_results[key] != value and zab_results[key] != str(value):