Merge pull request #38813 from gtmanfred/2016.3

catch SIGPIPE in vmware connection
This commit is contained in:
Mike Place 2017-01-18 14:05:41 -07:00 committed by GitHub
commit 50f03f8057

View File

@ -75,6 +75,7 @@ You should see output related to the ESXi host's syslog configuration.
# Import Python Libs
from __future__ import absolute_import
import atexit
import errno
import logging
import time
from salt.ext.six.moves.http_client import BadStatusLine # pylint: disable=E0611
@ -449,6 +450,10 @@ def get_mors_with_properties(service_instance, object_type, property_list=None,
content = get_content(*content_args, **content_kwargs)
except BadStatusLine:
content = get_content(*content_args, **content_kwargs)
except IOError as e:
if e.errno != errno.EPIPE:
raise e
content = get_content(*content_args, **content_kwargs)
object_list = []
for obj in content: