Not sure what happened here but there are conflicts in the diff.
Also, I think the new version of get_default_nic_ip will fail with a NameError if _get_default_nic_ip_by_ifconfig fails. I recommend changing the 'pass' in:
15 logging.exception("_get_default_nic_ip_by_ifconfig failed") 16 pass
to "return None"
« Back to merge proposal
Not sure what happened here but there are conflicts in the diff.
Also, I think the new version of get_default_nic_ip will fail with a NameError if _get_default_ nic_ip_ by_ifconfig fails. I recommend changing the 'pass' in:
15 logging. exception( "_get_default_ nic_ip_ by_ifconfig failed")
16 pass
to "return None"