Skip to content

Commit

Permalink
Merge branch 'develop' into fix_lvm
Browse files Browse the repository at this point in the history
  • Loading branch information
garethgreenaway authored Mar 1, 2019
2 parents 922d192 + 75d2c0c commit fbfe33c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion salt/states/zabbix_host.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def _interface_format(interfaces_data):
interface_type = interface_ports[value['type'].lower()][0]
main = '1' if six.text_type(value.get('main', 'true')).lower() == 'true' else '0'
useip = '1' if six.text_type(value.get('useip', 'true')).lower() == 'true' else '0'
interface_ip = value.get('ip')
interface_ip = value.get('ip', '')
dns = value.get('dns', key)
port = six.text_type(value.get('port', interface_ports[value['type'].lower()][1]))

Expand Down

0 comments on commit fbfe33c

Please sign in to comment.