valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25231 from thepauleh/patch-1

Browse Source 
[25230] Change LXC version to come from lxc-info
This commit is contained in:
Erik Johnson 2015-07-08 11:09:06 -05:00
commit 08bbfcd4d9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/lxc.py
View File

@ -117,7 +117,7 @@ def version():
''' '''
k = 'lxc.version' k = 'lxc.version'
if not __context__.get(k, None): if not __context__.get(k, None):
cversion = __salt__['cmd.run_all']('lxc-ls --version') cversion = __salt__['cmd.run_all']('lxc-info --version')
if not cversion['retcode']: if not cversion['retcode']:
ver = distutils.version.LooseVersion(cversion['stdout']) ver = distutils.version.LooseVersion(cversion['stdout'])
if ver < distutils.version.LooseVersion('1.0'): if ver < distutils.version.LooseVersion('1.0'):