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

allow virtual aliases to be used for the driver name

Browse source 
This checks if the driver name for cloud is in any passed in
virtual_aliases.
This commit is contained in:
Daniel Wallace 2018-06-18 12:46:39 -05:00
parent 60c9490bdc
commit 45249d3e10
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/cloud/clouds/digitalocean.py
View file

@ -83,9 +83,10 @@ def get_configured_provider():
Return the first configured instance.
'''
return config.is_provider_configured(
__opts__,
__active_provider_name__ or __virtualname__,
('personal_access_token',)
opts=__opts__,
provider=__active_provider_name__ or __virtualname__,
aliases=__virtual_aliases__,
required_keys=('personal_access_token',)
)

4
salt/config/__init__.py
View file

@ -3325,7 +3325,7 @@ def get_cloud_config_value(name, vm_, opts, default=None, search_global=True):
return value
def is_provider_configured(opts, provider, required_keys=(), log_message=True):
def is_provider_configured(opts, provider, required_keys=(), log_message=True, aliases=()):
'''
Check and return the first matching and fully configured cloud provider
configuration.
@ -3353,7 +3353,7 @@ def is_provider_configured(opts, provider, required_keys=(), log_message=True):
for alias, drivers in six.iteritems(opts['providers']):
for driver, provider_details in six.iteritems(drivers):
if driver != provider:
if driver != provider and driver not in aliases:
continue
# If we reached this far, we have a matching provider, let's see if