diff --git a/Vagrantfile b/Vagrantfile index 785daaf515..2edeb8fb5a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -31,17 +31,6 @@ Vagrant.configure(2) do |config| # Configure the disk size. disk_size = "60GB" - config.vm.define "ubuntu1804" do |bionic| - bionic.vm.box = "ubuntu/bionic64" - bionic.disksize.size = disk_size - config.vm.provision "shell", - privileged: true, - inline: <<-SHELL - cd /vagrant - ./scripts/gate-check-commit.sh - SHELL - end - config.vm.define "opensuse423" do |leap423| leap423.disksize.size = disk_size leap423.vm.box = "opensuse/openSUSE-42.3-x86_64" diff --git a/deploy-guide/source/deploymenthost.rst b/deploy-guide/source/deploymenthost.rst index de8f92d2c3..2be58b06e9 100644 --- a/deploy-guide/source/deploymenthost.rst +++ b/deploy-guide/source/deploymenthost.rst @@ -26,7 +26,6 @@ Install the operating system Install one of the following supported operating systems on the deployment hosts: -* `Ubuntu server 18.04 (Bionic Beaver) LTS 64-bit `_ * `Ubuntu server 20.04 (Focal Fossa) LTS 64-bit `_ * `Debian 11 (Bullseye) LTS 64-bit `_ * `Centos 8 64-bit `_ diff --git a/deploy-guide/source/overview-requirements.rst b/deploy-guide/source/overview-requirements.rst index 789ea7cff1..c3074b98c4 100644 --- a/deploy-guide/source/overview-requirements.rst +++ b/deploy-guide/source/overview-requirements.rst @@ -12,8 +12,6 @@ following minimum requirements: * Ubuntu - * Ubuntu 18.04 LTS (Bionic Beaver) - * Ubuntu 20.04 LTS (Focal Fossa) * Linux kernel version ``4.15.0-0-generic`` or later is required. diff --git a/deploy-guide/source/targethosts-prepare.rst b/deploy-guide/source/targethosts-prepare.rst index e276ac2a3a..1e0f101e58 100644 --- a/deploy-guide/source/targethosts-prepare.rst +++ b/deploy-guide/source/targethosts-prepare.rst @@ -11,7 +11,6 @@ Installing the operating system Install one of the following supported operating systems on the target host: -* Ubuntu server 18.04 (Bionic Beaver) LTS 64-bit * Ubuntu server 20.04 (Focal Fossa) LTS 64-bit * Debian 10 64-bit * Centos 8 64-bit diff --git a/doc/source/admin/openstack-operations/verify-deploy.rst b/doc/source/admin/openstack-operations/verify-deploy.rst index 8f481b953c..3410b0baee 100644 --- a/doc/source/admin/openstack-operations/verify-deploy.rst +++ b/doc/source/admin/openstack-operations/verify-deploy.rst @@ -116,7 +116,7 @@ the OpenStack API and dashboard, as an administrator. | 1 | nova-conductor | aio1-nova-conductor-container-5482ff27 | internal | enabled | up | 2018-02-14T15:34:42.000000 | | 2 | nova-scheduler | aio1-nova-scheduler-container-0b594e89 | internal | enabled | up | 2018-02-14T15:34:47.000000 | | 5 | nova-consoleauth | aio1-nova-console-container-835ca240 | internal | enabled | up | 2018-02-14T15:34:47.000000 | - | 6 | nova-compute | ubuntu-bionic | nova | enabled | up | 2018-02-14T15:34:42.000000 | + | 6 | nova-compute | ubuntu-focal | nova | enabled | up | 2018-02-14T15:34:42.000000 | +----+------------------+----------------------------------------+----------+---------+-------+----------------------------+ #. Run an OpenStack command to ensure the networking services are @@ -130,7 +130,7 @@ the OpenStack API and dashboard, as an administrator. | ID | Agent Type | Host | Availability Zone | Alive | State | Binary | +--------------------------------------+----------------------+----------------------------------------+-------------------+-------+-------+---------------------------+ | 262b29fe-e60e-44b0-ae3c-065565f8deb7 | Metering agent | aio1-neutron-agents-container-2b0569d5 | None | :-) | UP | neutron-metering-agent | - | 41135f7f-9e6c-4122-b6b3-d131bfaae53e | Linux bridge agent | ubuntu-bionic | None | :-) | UP | neutron-linuxbridge-agent | + | 41135f7f-9e6c-4122-b6b3-d131bfaae53e | Linux bridge agent | ubuntu-focal | None | :-) | UP | neutron-linuxbridge-agent | | 615d12a8-e738-490a-8552-2a03c8544b51 | Metadata agent | aio1-neutron-agents-container-2b0569d5 | None | :-) | UP | neutron-metadata-agent | | 99b2abd3-a330-4ca7-b524-ed176c10b31c | DHCP agent | aio1-neutron-agents-container-2b0569d5 | nova | :-) | UP | neutron-dhcp-agent | | e0139a26-fbf7-4cee-a37f-90940dc5851f | Linux bridge agent | aio1-neutron-agents-container-2b0569d5 | None | :-) | UP | neutron-linuxbridge-agent | diff --git a/doc/source/user/aio/quickstart.rst b/doc/source/user/aio/quickstart.rst index 08a7642967..2ea9c206fb 100644 --- a/doc/source/user/aio/quickstart.rst +++ b/doc/source/user/aio/quickstart.rst @@ -121,8 +121,8 @@ version. .. note:: The |current_release_formal_name| release is only compatible with - Debian 11 (bullseye), Ubuntu 18.04 (Bionic Beaver), - Ubuntu 20.04 (Focal Fossa), CentOS 8 and CentOS 8 Stream. + Debian 11 (bullseye), Ubuntu 20.04 (Focal Fossa), CentOS 8 and + CentOS 8 Stream. .. warning:: The announcement of early end-of-life for CentOS 8 and the migration diff --git a/doc/source/user/limited-connectivity/index.rst b/doc/source/user/limited-connectivity/index.rst index c4d873f26c..759417e9fd 100644 --- a/doc/source/user/limited-connectivity/index.rst +++ b/doc/source/user/limited-connectivity/index.rst @@ -88,10 +88,10 @@ Many software packages are installed on Ubuntu hosts using `.deb` packages. Similar packaging mechanisms exist for other Linux distributions. We advise mirroring the repositories that host these packages. -Upstream Ubuntu repositories to mirror for Ubuntu 18.04 LTS: +Upstream Ubuntu repositories to mirror for Ubuntu 20.04 LTS: -- bionic -- bionic-updates +- focal +- focal-updates OpenStack-Ansible requires several other repositories to install specific components such as Galera and Ceph. diff --git a/doc/source/user/security/ssl-certificates.rst b/doc/source/user/security/ssl-certificates.rst index 42eb395b3d..d62224b6cf 100644 --- a/doc/source/user/security/ssl-certificates.rst +++ b/doc/source/user/security/ssl-certificates.rst @@ -222,8 +222,8 @@ The http-01 type challenge is used by certbot to deploy certificates so it is required that the public endpoint is accessible directly by the Certificate Authority. -Deployment of certificates using certbot has been validated for -openstack-ansible using Ubuntu Bionic. Other distributions should work +Deployment of certificates using LetsEncrypt has been validated for +openstack-ansible using Ubuntu Focal. Other distributions should work but are not tested. To deploy certificates with certbot, add the following to diff --git a/inventory/group_vars/ceph_all.yml b/inventory/group_vars/ceph_all.yml index c91cf87884..9d30c233e4 100644 --- a/inventory/group_vars/ceph_all.yml +++ b/inventory/group_vars/ceph_all.yml @@ -38,7 +38,7 @@ ceph_conf_overrides: "{{ (ceph_conf_overrides_rgw | default({})) | combine(ceph_ # needed. nfs_file_gw: "{{ (('ceph-nfs' in groups) and ('ceph-mds' in groups)) }}" nfs_obj_gw: False -nfs_ganesha_stable: "{{ (ansible_facts['distribution_release'] not in ['bionic', 'focal']) }}" +nfs_ganesha_stable: "{{ (ansible_facts['distribution_release'] not in ['focal']) }}" # NTP in an OSA environment is handled by ansible-hardening using chrony # ceph-ansible's default enabling of ntpd conflicts with the OSA defaults diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index 584da9a5ea..e2acb21531 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -54,17 +54,11 @@ assert: that: - (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bullseye') or - (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'bionic') or (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'focal') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8') msg: > The only supported platforms for this release are Debian 11 (Bullseye), - Ubuntu 18.04 LTS (Bionic), Ubuntu 20.04 LTS (Focal), CentOS 8 and CentOS 8 Stream. - - name: Check for a supported path - assert: - that: - - not (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'bionic' and install_method == 'distro') - msg: Distro installation path is not supported for this release for Ubuntu 18.04 (bionic) + Ubuntu 20.04 LTS (Focal), CentOS 8 and CentOS 8 Stream. roles: - role: "openstack_hosts" vars_files: diff --git a/releasenotes/notes/drop-bionic-d66991ef382baefe.yaml b/releasenotes/notes/drop-bionic-d66991ef382baefe.yaml new file mode 100644 index 0000000000..4b89a27da1 --- /dev/null +++ b/releasenotes/notes/drop-bionic-d66991ef382baefe.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The Yoga release of OpenStack-Ansible removes support for Ubuntu Bionic. + Deployments should be upgraded from Bionic to Focal before or during the + Xena release before upgrading to Yoga. diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml index 35f31aad0b..c266394dd3 100644 --- a/tests/roles/bootstrap-host/tasks/check-requirements.yml +++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml @@ -17,13 +17,11 @@ assert: that: (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bullseye') or - (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'bionic') or (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'focal') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8') msg: >- The only supported platforms for this release are Debian Bullseye, - Ubuntu 18.04 LTS (Bionic), Ubuntu 20.04 (Focal), - CentOS 8, CentOS 8 Stream + Ubuntu 20.04 (Focal), CentOS 8, CentOS 8 Stream when: (check_operating_system | default(True))| bool tags: - check-operating-system diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 0e72f9a214..5bdda44ddb 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -225,7 +225,7 @@ - job: name: openstack-ansible-varstest-aio parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic + nodeset: ubuntu-focal # Running linters check - job: @@ -237,9 +237,9 @@ # Experimental job for checking our AIO can deploy with # a different ansible version - job: - name: openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-bionic + name: openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-focal parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic + nodeset: ubuntu-focal branches: ^(devel|master)$ required-projects: - name: github.com/ansible/ansible @@ -250,9 +250,9 @@ # Experimental job for checking our AIO can deploy with # a different ansible version - job: - name: openstack-ansible-deploy_with_ansible_next-aio-ubuntu-bionic + name: openstack-ansible-deploy_with_ansible_next-aio-ubuntu-focal parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic + nodeset: ubuntu-focal branches: ^(devel|master)$ required-projects: - name: github.com/ansible/ansible @@ -339,64 +339,15 @@ parent: openstack-ansible-deploy-aio nodeset: ubuntu-focal -# ubuntu bionic - job: - name: openstack-ansible-deploy-aio_lxc-ubuntu-bionic + name: openstack-ansible-deploy-aio_qdrouterd-ubuntu-focal parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic + nodeset: ubuntu-focal - job: - name: openstack-ansible-deploy-aio_ceph-ubuntu-bionic + name: openstack-ansible-deploy-translations-ubuntu-focal parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic - -- job: - name: openstack-ansible-deploy-aio_proxy-ubuntu-bionic - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic - -- job: - name: openstack-ansible-deploy-aio_metal-ubuntu-bionic - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic - -- job: - name: openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic - -- job: - name: openstack-ansible-upgrade-aio_lxc-ubuntu-bionic - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic - timeout: 10800 - -- job: - name: openstack-ansible-upgrade-aio_metal-ubuntu-bionic - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic - timeout: 10800 - -- job: - name: openstack-ansible-upgrade-aio_ceph-ubuntu-bionic - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic - timeout: 10800 - -- job: - name: openstack-ansible-deploy-aio_octavia-ubuntu-bionic - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic - -- job: - name: openstack-ansible-deploy-aio_qdrouterd-ubuntu-bionic - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic - -- job: - name: openstack-ansible-deploy-translations-ubuntu-bionic - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic + nodeset: ubuntu-focal # centos 8 stream - job: diff --git a/zuul.d/playbooks/pre-gate-cleanup.yml b/zuul.d/playbooks/pre-gate-cleanup.yml index 95e2bf448a..b0e781619c 100644 --- a/zuul.d/playbooks/pre-gate-cleanup.yml +++ b/zuul.d/playbooks/pre-gate-cleanup.yml @@ -28,7 +28,7 @@ regexp: 'https' replace: "http" when: - - ansible_distribution_release in ['bionic', 'focal'] + - ansible_distribution_release in ['focal'] # NOTE(noonedeadpunk): Added until CentOS 8.3 released because of the bug: # https://bugzilla.redhat.com/show_bug.cgi?id=1777718 diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index f8785825d7..7a4028b80c 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -24,12 +24,12 @@ - openstack-tox-docs periodic: jobs: - - openstack-ansible-deploy-translations-ubuntu-bionic + - openstack-ansible-deploy-translations-ubuntu-focal experimental: jobs: - - openstack-ansible-deploy-aio_qdrouterd-ubuntu-bionic - - openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-bionic - - openstack-ansible-deploy_with_ansible_next-aio-ubuntu-bionic + - openstack-ansible-deploy-aio_qdrouterd-ubuntu-focal + - openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-focal + - openstack-ansible-deploy_with_ansible_next-aio-ubuntu-focal - project-template: name: openstack-ansible-deploy-aio_lxc-jobs @@ -155,7 +155,6 @@ - openstack-ansible-deploy-aio_metal-debian-bullseye - openstack-ansible-deploy-aio_metal-centos-8 - openstack-ansible-deploy-aio_metal-centos-8-stream - - openstack-ansible-deploy-aio_metal-ubuntu-bionic - openstack-ansible-deploy-aio_metal-ubuntu-focal - openstack-ansible-upgrade-aio_metal-centos-8-stream: voting: false @@ -165,7 +164,6 @@ - openstack-ansible-deploy-aio_metal-debian-bullseye - openstack-ansible-deploy-aio_metal-centos-8 - openstack-ansible-deploy-aio_metal-centos-8-stream - - openstack-ansible-deploy-aio_metal-ubuntu-bionic - openstack-ansible-deploy-aio_metal-ubuntu-focal - project-template: