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 #27245 from rallytime/fix-25079

Browse source 
If two ssh keynames are found in DigitalOcean, abort and warn the user.
This commit is contained in:
Mike Place 2015-09-18 15:42:36 -06:00
commit f3a847823b
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/cloud/clouds/digital_ocean.py
View file

@ -560,10 +560,20 @@ def list_keypairs(call=None):
items = query(method='account/keys')
ret = {}
for keypair in items['ssh_keys']:
ret[keypair['name']] = {}
for item in six.iterkeys(keypair):
ret[keypair['name']][item] = str(keypair[item])
for key_pair in items['ssh_keys']:
name = key_pair['name']
if name in ret:
raise SaltCloudSystemExit(
'A duplicate key pair name, \'{0}\', was found in DigitalOcean\'s '
'key pair list. Please change the key name stored by DigitalOcean. '
'Be sure to adjust the value of \'ssh_key_file\' in your cloud '
'profile or provider configuration, if necessary.'.format(
name
)
)
ret[name] = {}
for item in six.iterkeys(key_pair):
ret[name][item] = str(key_pair[item])
return ret