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 #32170 from gtmanfred/lxc_cloud_name

Browse source 
add name for lxc for use with cloud cache
This commit is contained in:
Nicole Thomas 2016-03-28 08:34:16 -06:00
commit 230443be6c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/cloud/clouds/lxc.py
View file

@ -281,6 +281,7 @@ def list_nodes(conn=None, call=None):
for lxcc, linfos in lxcs.items():
info = {
'id': lxcc,
'name': lxcc, # required for cloud cache
'image': None,
'size': linfos['size'],
'state': state.lower(),
@ -332,7 +333,7 @@ def list_nodes_select(call=None):
call = 'select'
if not get_configured_provider():
return
info = ['id', 'image', 'size', 'state', 'public_ips', 'private_ips']
info = ['id', 'name', 'image', 'size', 'state', 'public_ips', 'private_ips']
return salt.utils.cloud.list_nodes_select(
list_nodes_full(call='action'),
__opts__.get('query.selection', info), call)