Merge pull request #33698 from Unity-Technologies/vsphere-fixes

Vsphere fixes
saltstack · Jun 8, 2016 · a3202f1 · a3202f1
2 parents 01aaf3e + 8ff5906
commit a3202f1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/salt/utils/vmware.py b/salt/utils/vmware.py
@@ -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)