Merge pull request #342 from stackhpc/upstream/2024.1-2024-11-11

Synchronise 2024.1 with upstream
stackhpc · Nov 12, 2024 · fdc82bf · fdc82bf
2 parents 6b63a64 + 2c12fc6
commit fdc82bf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py b/playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py
@@ -12,8 +12,8 @@
 
 
 def _is_apt():
-    info = distro.linux_distribution()
-    return info[0].startswith('Ubuntu')
+    info = distro.id()
+    return info == 'ubuntu'
 
 
 def _is_dnf():
@@ -29,7 +29,7 @@ def _is_dnf_mirror():
 def _is_ubuntu_noble():
     name = distro.name()
     version = distro.version()
-    return name == 'Ubuntu' and version == 24.04
+    return name == 'Ubuntu' and version == '24.04'
 
 
 def test_network_ethernet(host):