From c1433650b4a4fe3a1dfe5fd6198ddf78773295a9 Mon Sep 17 00:00:00 2001 From: Joseph Hall Date: Wed, 9 Mar 2016 13:07:22 -0700 Subject: [PATCH] Show correct provider/driver name --- salt/cloud/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/salt/cloud/__init__.py b/salt/cloud/__init__.py index 78876d10b64b..e4804daca81b 100644 --- a/salt/cloud/__init__.py +++ b/salt/cloud/__init__.py @@ -1395,6 +1395,8 @@ 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() @@ -1402,8 +1404,10 @@ def run_profile(self, profile, names, vm_overrides=None): 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}