Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Porting #51915 to master #54685

Merged
merged 4 commits into from
Dec 14, 2019
Merged

[master] Porting #51915 to master #54685

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ed53a5
Porting PR #51915 to 2019.2.1
garethgreenaway Sep 19, 2019
cee9d2d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 25, 2019
2629b52
Merge branch 'master' into 2019_2_1_port_51915
dwoz Nov 12, 2019
438e797
Merge branch 'master' into 2019_2_1_port_51915
dwoz Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/states/zabbix_host.py
View file
Open in desktop
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