IP hack is needed on all partitions

763c82cc · Romain Courteaud · d6a0245b · 763c82cc
Commit 763c82cc authored Feb 29, 2012 by Romain Courteaud
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 11 deletions

slapos/recipe/softwaretype.py slapos/recipe/softwaretype.py +5 -11

No files found.
--- a/slapos/recipe/softwaretype.py
+++ b/slapos/recipe/softwaretype.py
@@ -122,17 +122,11 @@ class Recipe:
      buildout.set('slap-parameter', parameter, value)
    buildout.add_section('slap-network-information')
-    if software_type in ('production', 'mariadb-prod'):
+    # XXX Hack for beteireflow production
-      # XXX Hack for beteireflow production
+    buildout.set('slap-network-information', 'local-ipv4', 
-      buildout.set('slap-network-information', 'local-ipv4', 
+                 self.getLoopbackIPv4Address())
-                   self.getLoopbackIPv4Address())
+    buildout.set('slap-network-information', 'global-ipv6', 
-      buildout.set('slap-network-information', 'global-ipv6', 
+                 self.getGlobalIPv4Address())
-                   self.getGlobalIPv4Address())
-    else:
-      buildout.set('slap-network-information', 'local-ipv4', 
-                   self.getLocalIPv4Address())
-      buildout.set('slap-network-information', 'global-ipv6', 
-                   self.getGlobalIPv6Address())
    # Copy/paste slap_connection
    buildout.add_section('slap-connection')