Merge pull request #129 from tonicbupt/dev

allow underscores in hostname due to `docker link`
projectcalico · Aug 12, 2016 · 3f2cbb0 · 3f2cbb0
2 parents 8219a60 + c7af60e
commit 3f2cbb0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/calico_containers/pycalico/util.py b/calico_containers/pycalico/util.py
@@ -423,7 +423,7 @@ def verify_hostname(hostname):
 
     # Hostname labels may consist of numbers, letters and hyphens, but may not
     # end or begin with a hyphen.
-    allowed = re.compile(r"(?!-)[a-z\d-]{1,63}(?<!-)$", re.IGNORECASE)
+    allowed = re.compile(r"(?!-)[_a-z\d-]{1,63}(?<!-)$", re.IGNORECASE)
     for part in hostname.split('.'):
         if not allowed.match(part):
             err_mess = ("Hostname labels (parts delimited by periods) may "