From ad73fda3b75f9fee43cd31d3cc27263f4dbbef7d Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 17 Jul 2024 10:10:26 +0100 Subject: [PATCH] Permit Ubuntu Noble for deploy host and targets in requirements checks Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-repo_server/+/925571 Change-Id: I0cec77caee70bac6e8a2c994170cdafd9754f9f9 --- playbooks/openstack-hosts-setup.yml | 1 + tests/roles/bootstrap-host/tasks/check-requirements.yml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index b54f9156c1..92e32c030c 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -61,6 +61,7 @@ that: - (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bookworm') or (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'jammy') or + (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'noble') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '9') msg: > The only supported platforms for this release are Debian 12 (Bookworm) diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml index 51a1e80bc3..7976ae97cd 100644 --- a/tests/roles/bootstrap-host/tasks/check-requirements.yml +++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml @@ -18,10 +18,12 @@ that: (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bookworm') or (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'jammy') or + (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'noble') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '9') msg: >- The only supported platforms for this release are Debian 12 (Bookworm), - Ubuntu 22.04 (Jammy), CentOS Stream 9, and derivatives such as Rocky Linux. + Ubuntu 22.04 (Jammy), Ubuntu 24.04 (Noble), CentOS Stream 9, + and derivatives such as Rocky Linux. when: (check_operating_system | default(True))| bool tags: - check-operating-system