Force ipv4 for production configuration

75bc8d67 · Romain Courteaud · 270da7b2 · 75bc8d67
Commit 75bc8d67 authored Mar 02, 2012 by Romain Courteaud
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

slapos/recipe/softwaretype.py slapos/recipe/softwaretype.py +2 -2

No files found.
--- a/slapos/recipe/softwaretype.py
+++ b/slapos/recipe/softwaretype.py
@@ -37,13 +37,13 @@ import logging
 import zc.buildout

 def validLoopBackAddress(ip):
-  if netaddr.IPAddress(ip).is_loopback():
+  if netaddr.IPAddress(ip).is_loopback() and netaddr.valid_ipv4(ip):
    return True
  else:
    return False

 def validPublicAddress(ip):
-  return not validLoopBackAddress(ip)
+  return (not validLoopBackAddress(ip)) and netaddr.valid_ipv4(ip):

 class Recipe: