Permalink
Browse files

last lxc review bits

  • Loading branch information...
1 parent f15961c commit 37f8a66ac592f6931f85405f8476b7d29923bbc5 @kiorky kiorky committed Mar 6, 2014
Showing with 7 additions and 4 deletions.
  1. +0 −1 salt/cloud/__init__.py
  2. +7 −3 salt/modules/lxc.py
View
@@ -13,7 +13,6 @@
import time
import signal
import logging
-from pprint import pprint
import multiprocessing
from itertools import groupby
View
@@ -45,12 +45,16 @@ def _ip_sort(ip):
def __virtual__():
+ if salt.utils.which('lxc-start'):
+ return True
'''
To speed up the whole thing, we decided to not use the
subshell way and assume things are in place for lxc
Discussion made by @kiorky and @thatch45
- if salt.utils.which('lxc-autostart'):
- return 'lxc'
+
+ lxc-version presence is not sufficient, in lxc1.0 alpha
+ (precise backports), we have it and it is sufficient
+ for the module to execute.
elif salt.utils.which('lxc-version'):
passed = False
try:
@@ -63,7 +67,7 @@ def __virtual__():
return 'lxc'
return False
'''
- return True
+ return False
def _lxc_profile(profile):

0 comments on commit 37f8a66

Please sign in to comment.