valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #37607 from techhat/badstatusline

Browse Source 
Try the connection again, in case it's been reset
This commit is contained in:
Mike Place 2016-11-11 14:59:46 +13:00 committed by GitHub
commit 9d207c0224
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
salt/utils/vmware.py
View File

@ -78,6 +78,7 @@ from __future__ import absolute_import
import atexit
import logging
import time
from salt.ext.six.moves.http_client import BadStatusLine # pylint: disable=E0611
# Import Salt Libs
import salt.exceptions
@ -696,11 +697,15 @@ def get_mors_with_properties(service_instance, object_type, property_list=None,
container. If that is the case, the traversal spec needs to be None.
'''
# Get all the content
content = get_content(service_instance, object_type,
property_list=property_list,
container_ref=container_ref,
traversal_spec=traversal_spec,
local_properties=local_properties)
content_args = [service_instance, object_type]
content_kwargs = {'property_list': property_list,
'container_ref': container_ref,
'traversal_spec': traversal_spec,
'local_properties': local_properties}
try:
content = get_content(*content_args, **content_kwargs)
except BadStatusLine:
content = get_content(*content_args, **content_kwargs)
object_list = []
for obj in content: