From 8b6fd3da04d0515d422fd3bc465e48a1e20173a0 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 17 Jun 2020 08:03:15 +0100 Subject: [PATCH] Add Ubuntu Focal support Depends-On: https://review.opendev.org/736035 Change-Id: Ifcd9ec49ee8ad6750573531aa4d877b36915533b --- playbooks/openstack-hosts-setup.yml | 1 + .../add-focal-support-54ae4be4f524db7b.yaml | 7 +++++++ .../tasks/check-requirements.yml | 1 + zuul.d/jobs.yaml | 21 +++++++++++++++++++ zuul.d/project-templates.yaml | 10 +++++++-- 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/add-focal-support-54ae4be4f524db7b.yaml diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index f40edba70b..63ed7fffeb 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -56,6 +56,7 @@ - (ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch') or (ansible_distribution == 'Debian' and ansible_distribution_release == 'buster') or (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic') or + (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'focal') or (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') or (ansible_os_family == 'Suse' and ansible_distribution_major_version in ['15', '42']) msg: "The only supported platforms for this release are Debian Stretch or Buster, Ubuntu 18.04 LTS (Bionic), CentOS 7 (WIP) and openSUSE Leap 42.X and openSUSE Leap 15.X" diff --git a/releasenotes/notes/add-focal-support-54ae4be4f524db7b.yaml b/releasenotes/notes/add-focal-support-54ae4be4f524db7b.yaml new file mode 100644 index 0000000000..63b70c5a0a --- /dev/null +++ b/releasenotes/notes/add-focal-support-54ae4be4f524db7b.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + Support is added for deploying OpenStack on Ubuntu Focal (20.04) with + source based installs. Ubuntu Cloud Archive is not available for Focal + at this point so it is not possible to offer distro package based + installs for Focal. diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml index 478cd73446..5964a596d6 100644 --- a/tests/roles/bootstrap-host/tasks/check-requirements.yml +++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml @@ -19,6 +19,7 @@ - (ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch') or (ansible_distribution == 'Debian' and ansible_distribution_release == 'buster') or (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic') or + (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'focal') or (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') or (ansible_os_family == 'Suse' and ansible_distribution_major_version in ['42', '15']) msg: >- diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index b2eaba5adb..5b8000d387 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -185,6 +185,27 @@ parent: openstack-ansible-deploy-aio nodeset: debian-buster +# ubuntu focal +- job: + name: openstack-ansible-deploy-aio_lxc-ubuntu-focal + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-focal + +- job: + name: openstack-ansible-deploy-aio_ceph-ubuntu-focal + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-focal + +- job: + name: openstack-ansible-deploy-aio_proxy-ubuntu-focal + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-focal + +- job: + name: openstack-ansible-deploy-aio_metal-ubuntu-focal + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-focal + # ubuntu - job: name: openstack-ansible-deploy-aio_lxc-ubuntu-bionic diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index ee652d1c50..fafd967d03 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -41,11 +41,13 @@ - openstack-ansible-deploy-aio_lxc-centos-7 - openstack-ansible-deploy-aio_lxc-debian-buster - openstack-ansible-deploy-aio_lxc-ubuntu-bionic + - openstack-ansible-deploy-aio_lxc-ubuntu-focal gate: jobs: - openstack-ansible-deploy-aio_lxc-centos-7 - openstack-ansible-deploy-aio_lxc-debian-buster - openstack-ansible-deploy-aio_lxc-ubuntu-bionic + - openstack-ansible-deploy-aio_lxc-ubuntu-focal periodic: jobs: - openstack-ansible-deploy-aio_lxc-ubuntu-bionic @@ -69,6 +71,7 @@ - openstack-ansible-deploy-aio_metal-debian-buster - openstack-ansible-deploy-aio_metal-centos-7 - openstack-ansible-deploy-aio_metal-ubuntu-bionic + - openstack-ansible-deploy-aio_metal-ubuntu-focal - openstack-ansible-upgrade-aio_metal-centos-7: voting: false - openstack-ansible-upgrade-aio_metal-ubuntu-bionic @@ -77,6 +80,7 @@ - openstack-ansible-deploy-aio_metal-debian-buster - openstack-ansible-deploy-aio_metal-centos-7 - openstack-ansible-deploy-aio_metal-ubuntu-bionic + - openstack-ansible-deploy-aio_metal-ubuntu-focal experimental: jobs: - openstack-ansible-deploy-aio_metal-opensuse-15 @@ -129,6 +133,8 @@ check: jobs: - openstack-ansible-deploy-aio_ceph-ubuntu-bionic + - openstack-ansible-deploy-aio_ceph-ubuntu-focal: + voting: false gate: jobs: - openstack-ansible-deploy-aio_ceph-ubuntu-bionic @@ -141,10 +147,10 @@ name: openstack-ansible-deploy-proxy-jobs check: jobs: - - openstack-ansible-deploy-aio_proxy-ubuntu-bionic + - openstack-ansible-deploy-aio_proxy-ubuntu-focal gate: jobs: - - openstack-ansible-deploy-aio_proxy-ubuntu-bionic + - openstack-ansible-deploy-aio_proxy-ubuntu-focal - project-template: name: openstack-ansible-deploy-distro_ceph-jobs