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

cloud roster: Return proper target name

Browse source 
The cloud roster places an instance's info under 'tgt' key in the
dictionary it returns. Because of this salt-ssh reports host name 'tgt'
instead of the specified in the command line. Fix it.
This commit is contained in:
Sergei Zviagintsev 2017-03-03 01:03:14 +01:00
parent 637930b2b3
commit a18250b2e4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/roster/cloud.py
View file

@ -85,7 +85,7 @@ def targets(tgt, tgt_type='glob', **kwargs): # pylint: disable=W0613
))
preferred_ip = extract_ipv4(roster_order, ip_list)
ret['tgt'] = {
ret[tgt] = {
'host': preferred_ip,
}
@ -94,27 +94,27 @@ def targets(tgt, tgt_type='glob', **kwargs): # pylint: disable=W0613
)
ssh_username = salt.utils.cloud.ssh_usernames({}, cloud_opts)
if isinstance(ssh_username, string_types):
ret['tgt']['user'] = ssh_username
ret[tgt]['user'] = ssh_username
elif isinstance(ssh_username, list):
ret['tgt']['user'] = ssh_username[0]
ret[tgt]['user'] = ssh_username[0]
password = salt.config.get_cloud_config_value(
'password', vm_, cloud_opts, search_global=False, default=None
)
if password:
ret['tgt']['password'] = password
ret[tgt]['password'] = password
key_filename = salt.config.get_cloud_config_value(
'private_key', vm_, cloud_opts, search_global=False, default=None
)
if key_filename:
ret['tgt']['priv'] = key_filename
ret[tgt]['priv'] = key_filename
sudo = salt.config.get_cloud_config_value(
'sudo', vm_, cloud_opts, search_global=False, default=None
)
if sudo:
ret['tgt']['sudo'] = sudo
ret[tgt]['sudo'] = sudo
return ret