summaryrefslogtreecommitdiffstats
path: root/roles/os_zabbix
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-08-20 11:44:27 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-08-20 12:18:19 -0400
commit49923edfba6d396140881d6a920e83f9ecf79f77 (patch)
treea11bb5df45b188021b733d6fdab785d9a5604ff5 /roles/os_zabbix
parenta473ade355c72b45bff57f01ecd8898725977405 (diff)
downloadopenshift-49923edfba6d396140881d6a920e83f9ecf79f77.tar.gz
openshift-49923edfba6d396140881d6a920e83f9ecf79f77.tar.bz2
openshift-49923edfba6d396140881d6a920e83f9ecf79f77.tar.xz
openshift-49923edfba6d396140881d6a920e83f9ecf79f77.zip
fixed zbx_user. Update password playbook added
Diffstat (limited to 'roles/os_zabbix')
-rw-r--r--roles/os_zabbix/library/zbx_user.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/roles/os_zabbix/library/zbx_user.py b/roles/os_zabbix/library/zbx_user.py
index 50f6fc075..c45c9a75d 100644
--- a/roles/os_zabbix/library/zbx_user.py
+++ b/roles/os_zabbix/library/zbx_user.py
@@ -54,13 +54,15 @@ def get_usergroups(zapi, usergroups):
if content['result']:
ugroups.append({'usrgrpid': content['result'][0]['usrgrpid']})
- return ugroups
-
+ return ugroups or None
def get_usertype(user_type):
'''
Determine zabbix user account type
'''
+ if not user_type:
+ return None
+
utype = 1
if 'super' in user_type:
utype = 3
@@ -84,9 +86,9 @@ def main():
alias=dict(default=None, type='str'),
name=dict(default=None, type='str'),
surname=dict(default=None, type='str'),
- user_type=dict(default='user', type='str'),
+ user_type=dict(default=None, type='str'),
passwd=dict(default=None, type='str'),
- usergroups=dict(default=None, type='list'),
+ usergroups=dict(default=[], type='list'),
debug=dict(default=False, type='bool'),
state=dict(default='present', type='str'),
),
@@ -129,6 +131,9 @@ def main():
'type': get_usertype(module.params['user_type']),
}
+ # Remove any None valued params
+ _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
+
if not exists(content):
# if we didn't find it, create it
content = zapi.get_content(zbx_class_name, 'create', params)