last lxc review bits

saltstack · Mar 6, 2014 · 37f8a66 · 37f8a66
1 parent f15961c
commit 37f8a66
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/salt/cloud/__init__.py b/salt/cloud/__init__.py
@@ -13,7 +13,6 @@
 import time
 import signal
 import logging
-from pprint import pprint
 import multiprocessing
 from itertools import groupby
 

diff --git a/salt/modules/lxc.py b/salt/modules/lxc.py
@@ -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):