Merge "Check for ubuntu16.04 where distribution is 'xenial'"

Juniper · Dec 7, 2016 · a5898d7 · a5898d7
2 parents 432bb7d + 1a7c7d9
commit a5898d7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/fabfile/utils/fabos.py b/fabfile/utils/fabos.py
@@ -21,9 +21,10 @@ def get_linux_distro():
 
 def detect_ostype():
     (dist, version, extra) = get_linux_distro()
-    if dist.lower() != 'ubuntu':
-        if extra is not None and 'xen' in extra:
-            dist = 'xen'
+    if version.startswith('16.04') and 'xenial' in extra:
+        dist = dist
+    elif extra is not None and 'xen' in extra:
+        dist = 'xen'
     elif 'red hat' in dist.lower():
         dist = 'redhat'
     elif 'centos linux' in dist.lower():