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 remote-tracking branch 'upstream/2015.8' into boto_secgroup_add_vpc_name

Browse source
This commit is contained in:
Tom Williams 2015-09-30 21:06:37 -04:00
commit 35b66e28a3
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/cli.py
View file

@ -342,7 +342,11 @@ class SaltCloud(parsers.SaltCloudParser):
if dmap.get('existing', None):
for name in dmap['existing']:
ret[name] = {'Message': 'Already running'}
if 'ec2' in dmap['existing'][name]['provider']:
msg = 'Instance already exists, or is terminated and has the same name.'
else:
msg = 'Already running.'
ret[name] = {'Message': msg}
except (SaltCloudException, Exception) as exc:
msg = 'There was a query error: {0}'