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

Merge pull request #31775 from techhat/correctmsg

Browse source 
Show correct provider/driver name
This commit is contained in:
Nicole Thomas 2016-03-09 13:53:10 -07:00
commit 92ba7f3495
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/cloud/__init__.py
View file

@ -1395,6 +1395,8 @@ class Cloud(object):
prov_name = mapped_providers[prov].keys()[0]
for node in mapped_providers[prov][prov_name]:
vms[node] = mapped_providers[prov][prov_name][node]
vms[node]['provider'] = prov
vms[node]['driver'] = prov_name
alias, driver = profile_details['provider'].split(':')
provider_details = self.opts['providers'][alias][driver].copy()
@ -1402,8 +1404,10 @@ class Cloud(object):
for name in names:
if name in vms:
prov = vms[name]['provider']
driv = vms[name]['driver']
msg = six.u('{0} already exists under {1}:{2}').format(
name, alias, driver
name, prov, driv
)
log.error(msg)
ret[name] = {'Error': msg}