node boot: Fix config option getter for IPv6 interface

/reviewed-on nexedi/slapos.core!70

node boot: Fix config option getter for IPv6 interface
/reviewed-on nexedi/slapos.core!70
b0cac659 · Guillaume Hervier · Thomas Gambier · 93d37131 · b0cac659
Commit b0cac659 authored Dec 06, 2018 by Guillaume Hervier Committed by Thomas Gambier Dec 06, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

slapos/cli/boot.py slapos/cli/boot.py +5 -2

No files found.
--- a/slapos/cli/boot.py
+++ b/slapos/cli/boot.py
@@ -159,8 +159,11 @@ class BootCommand(ConfigCommand):
        master_hostname = master_url.hostname

        # Check that we have IPv6 ready
-        _waitIpv6Ready(configp.get('slapformat', 'ipv6_interface') or
-                       configp.get('slapformat', 'interface_name'))
+        if configp.has_option('slapformat', 'ipv6_interface'):
+            ipv6_interface = configp.get('slapformat', 'ipv6_interface')
+        else:
+            ipv6_interface = configp.get('slapformat', 'interface_name')
+        _waitIpv6Ready(ipv6_interface)

        # Check that node can ping master
        if valid_ipv4(master_hostname):