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

_vm_provider_driver isn't needed anymore

Browse source 
We deprecated some of these names in 2017.7, and this function is no longer
needed
This commit is contained in:
Daniel Wallace 2017-08-21 11:26:02 -06:00
parent dbee735f6e
commit b7283bcc6f
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/cloud/clouds/ec2.py
View file

@ -3432,7 +3432,7 @@ def list_nodes_full(location=None, call=None):
ret = {}
locations = set(
get_location(vm_) for vm_ in six.itervalues(__opts__['profiles'])
if _vm_provider_driver(vm_)
if vm_.get('driver') == 'ec2'
)
# If there aren't any profiles defined for EC2, check
@ -3447,17 +3447,6 @@ def list_nodes_full(location=None, call=None):
return _list_nodes_full(location)
def _vm_provider_driver(vm_):
alias, driver = vm_['driver'].split(':')
if alias not in __opts__['providers']:
return None
if driver not in __opts__['providers'][alias]:
return None
return driver == 'ec2'
def _extract_name_tag(item):
if 'tagSet' in item and item['tagSet'] is not None:
tagset = item['tagSet']