diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-08-27 17:08:06 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2015-08-27 17:08:06 -0400 |
| commit | a564019bba52238e6f1146bfdb2f70145ca3685b (patch) | |
| tree | 3debf49c12a55cb7a477577dcf6a0600b05afcd3 /roles/lib_zabbix/library/zbx_item.py | |
| parent | b21b38d1dfdcd8a2ab8e7b52b46608d06386feae (diff) | |
| parent | e8d71b6ed7421644a765564c85ca3ee32182fed2 (diff) | |
| download | openshift-a564019bba52238e6f1146bfdb2f70145ca3685b.tar.gz openshift-a564019bba52238e6f1146bfdb2f70145ca3685b.tar.bz2 openshift-a564019bba52238e6f1146bfdb2f70145ca3685b.tar.xz openshift-a564019bba52238e6f1146bfdb2f70145ca3685b.zip | |
Merge pull request #524 from kwoodson/zbxfix
Updating zabbix for env vars.
Diffstat (limited to 'roles/lib_zabbix/library/zbx_item.py')
| -rw-r--r-- | roles/lib_zabbix/library/zbx_item.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_zabbix/library/zbx_item.py b/roles/lib_zabbix/library/zbx_item.py index 60da243fe..bcd389e47 100644 --- a/roles/lib_zabbix/library/zbx_item.py +++ b/roles/lib_zabbix/library/zbx_item.py @@ -80,8 +80,8 @@ def main(): module = AnsibleModule( argument_spec=dict( zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'), - zbx_user=dict(default=os.environ['ZABBIX_USER'], type='str'), - zbx_password=dict(default=os.environ['ZABBIX_PASSWORD'], type='str'), + zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'), + zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'), zbx_debug=dict(default=False, type='bool'), name=dict(default=None, type='str'), key=dict(default=None, type='str'), |