Don't raise if impossible to find slapos configuration.

1cc5ca7b · Cédric de Saint Martin · eeed7ff9 · 1cc5ca7b
Commit 1cc5ca7b authored Apr 15, 2013 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

slapprepare/slapprepare/slapprepare.py slapprepare/slapprepare/slapprepare.py +6 -3

No files found.
--- a/slapprepare/slapprepare/slapprepare.py
+++ b/slapprepare/slapprepare/slapprepare.py
@@ -511,10 +511,13 @@ def prepare_from_scratch(config):
             ,'--ipv6-interface', config.ipv6_interface
             ,'--partition-number', config.partition_amount])
-    if config.need_bridge:
+    if getSlaposConfiguration():
-      setup_bridge(slapos_configuration, True)
+      if config.need_bridge:
+        setup_bridge(slapos_configuration, True)
+      else:
+        setup_bridge(slapos_configuration, False)
    else:
-      setup_bridge(slapos_configuration, False)
+      print 'Warning: impossible to set up bridge because slapos configuration doesn\'t exist.'
    computer_id = get_computer_name(
        os.path.join('/', slapos_configuration, 'slapos.cfg'))