Merge remote-tracking branch 'origin/leo_no_bridge_fixes'

slapos/format.py

@@ -360,7 +360,9 @@ class Computer(object):
           old_partition_address_list = partition.address_list
           partition.address_list = []
           if len(old_partition_address_list) != 2:
-            raise ValueError('There should be exactly 2 stored addresses')
+            raise ValueError(
+              'There should be exactly 2 stored addresses. Got: %r' %
+              (old_partition_address_list,))
           if not any([netaddr.valid_ipv6(q['addr'])
               for q in old_partition_address_list]):
             raise ValueError('Not valid ipv6 addresses loaded')
@@ -1097,10 +1099,12 @@ class Config(object):
     if not self.dry_run:
       if self.alter_user:
         self.checkRequiredBinary(['groupadd', 'useradd', 'usermod'])
+      if not self.no_bridge:
+        self.checkRequiredBinary(['tunctl'])
       if self.alter_network:
-        self.checkRequiredBinary(['ip', 'tunctl'])
+        self.checkRequiredBinary(['ip'])
     # Required, even for dry run
-    if self.alter_network:
+    if self.alter_network and not self.no_bridge:
       self.checkRequiredBinary(['brctl'])
 
     # Check if root is needed