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

Pillar-based cloud providers still forcing use of deprecated 'provider'

Browse source 
Similar to #27953
This commit is contained in:
Ronald van Zantvoort 2015-12-15 18:38:00 +01:00
parent fe0778dad5
commit 65e2d9ac1e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/cloud/__init__.py
View file

@ -182,7 +182,13 @@ class CloudClient(object):
if pillars:
for name, provider in six.iteritems(pillars.pop('providers', {})):
driver = provider['provider']
# Since using "provider: <provider-engine>" is deprecated, alias provider
# to use driver: "driver: <provider-engine>"
if 'provider' in provider:
driver = provider.pop('provider')
else
driver = provider['driver']
provider['profiles'] = {}
self.opts['providers'].update({name: {driver: provider}})
for name, profile in six.iteritems(pillars.pop('profiles', {})):