Merge pull request #33946 from rallytime/bp-33698

Back-port #33698 to 2015.8
This commit is contained in:
Mike Place 2016-06-13 08:55:22 -07:00 committed by GitHub
commit 0281d491c6

View file

@ -187,7 +187,8 @@ def get_service_instance(host, username, password, protocol=None, port=None):
service_instance = GetSi()
if service_instance:
if service_instance._GetStub().host == ':'.join([host, str(port)]):
service_instance._GetStub().GetConnection()
if salt.utils.is_proxy():
service_instance._GetStub().GetConnection()
return service_instance
Disconnect(service_instance)