Merge pull request #31775 from techhat/correctmsg

Show correct provider/driver name
saltstack · Mar 9, 2016 · 92ba7f3 · 92ba7f3
2 parents 249a360 + c143365
commit 92ba7f3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/salt/cloud/__init__.py b/salt/cloud/__init__.py
@@ -1395,15 +1395,19 @@ def run_profile(self, profile, names, vm_overrides=None):
             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()
         del provider_details['profiles']
 
         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}