Merge pull request #129 from tonicbupt/dev

allow underscores in hostname due to `docker link`

Author: robbrockbank

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 "