saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Pylint.

Browse source
This commit is contained in:
rallytime 2015-11-03 16:43:48 -07:00
parent d9301eea95
commit 403fe37704
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/cloud/clouds/vmware.py
View file

@ -80,8 +80,7 @@ import salt.config as config
# Attempt to import pyVim and pyVmomi libs
try:
from pyVim.connect import SmartConnect, Disconnect
from pyVmomi import vim, vmodl
from pyVmomi import vim
HAS_PYVMOMI = True
except Exception:
HAS_PYVMOMI = False
@ -3192,7 +3191,7 @@ def remove_all_snapshots(name, kwargs=None, call=None):
'The remove_all_snapshots action must be called with '
'-a or --action.'
)
_str_to_bool(kwargs.get('merge_snapshots')) if kwargs and 'merge_snapshots' in kwargs else True
connection = _str_to_bool(kwargs.get('merge_snapshots')) if kwargs and 'merge_snapshots' in kwargs else True
vm_ref = vmware.get_mor_by_property(_get_si(), vim.VirtualMachine, name)