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: Work with custom conf dir

Browse source 
A path to salt-cloud config file is hardcoded into the cloud roster, so
it won't work with custom conf dir. Remove the hardcoded path and
construct it using __opts__['conf_file'].
This commit is contained in:
Sergei Zviagintsev 2017-03-02 14:21:53 +01:00
parent b0501515cb
commit dd1d3aac74
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/roster/cloud.py
View file

@ -89,7 +89,9 @@ def targets(tgt, tgt_type='glob', **kwargs): # pylint: disable=W0613
'host': preferred_ip,
}
cloud_opts = salt.config.cloud_config('/etc/salt/cloud')
cloud_opts = salt.config.cloud_config(
os.path.join(os.path.dirname(__opts__['conf_file']), 'cloud')
)
ssh_username = salt.utils.cloud.ssh_usernames({}, cloud_opts)
if isinstance(ssh_username, string_types):
ret['tgt']['user'] = ssh_username