Allow to install in context of erp5testnode

31dcda6b · Romain Courteaud · d930a84e · 31dcda6b
Commit 31dcda6b authored Mar 02, 2012 by Romain Courteaud
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

slapos/recipe/softwaretype.py slapos/recipe/softwaretype.py +8 -4

No files found.
--- a/slapos/recipe/softwaretype.py
+++ b/slapos/recipe/softwaretype.py
@@ -123,10 +123,14 @@ class Recipe:
    buildout.add_section('slap-network-information')
    # XXX Hack for beteireflow production
-    buildout.set('slap-network-information', 'local-ipv4', 
+    try:
-                 self.getLoopbackIPv4Address())
+      local_ip = self.getLoopbackIPv4Address()
-    buildout.set('slap-network-information', 'global-ipv6', 
+      global_ip = self.getGlobalIPv4Address()
-                 self.getGlobalIPv4Address())
+    except AttributeError:
+      local_ip = self.getLocalIPv4Address()
+      global_ip = self.getGlobalIPv6Address()
+    buildout.set('slap-network-information', 'local-ipv4', global_ip)
+    buildout.set('slap-network-information', 'global-ipv6', global_ip)
    # Copy/paste slap_connection
    buildout.add_section('slap-connection')