Merge "Drop support for Ubuntu Xenial"

openstack · Jul 17, 2019 · 8c0f5c1 · 8c0f5c1
2 parents f2beaf9 + b3da024
commit 8c0f5c1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git 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 16.04 (Xenial Xerus) LTS 64-bit <http://releases.ubuntu.com/16.04/>`_
 * `Ubuntu server 18.04 (Bionic Beaver) LTS 64-bit <http://releases.ubuntu.com/18.04/>`_
 * `Centos 7 64-bit <https://www.centos.org/download/>`_
 * `openSUSE 42.X 64-bit <https://software.opensuse.org/distributions/leap>`_

diff --git 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 16.04 (Xenial Xerus) LTS 64-bit
 * Ubuntu server 18.04 (Bionic Beaver) LTS 64-bit
 * Centos 7 64-bit
 * openSUSE 42.X 64-bit

diff --git 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-xenial                          | nova     | enabled | up    | 2018-02-14T15:34:42.000000 |
+      |  6 | nova-compute     | ubuntu-bionic                          | 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-xenial                          | None              | :-)   | UP    | neutron-linuxbridge-agent |
+      | 41135f7f-9e6c-4122-b6b3-d131bfaae53e | Linux bridge agent   | ubuntu-bionic                          | 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 |
@@ -149,8 +149,8 @@ the OpenStack API and dashboard, as an administrator.
       | Binary           | Host                                     | Zone | Status  | State | Updated At                 |
       +------------------+------------------------------------------+------+---------+-------+----------------------------+
       | cinder-scheduler | aio1-cinder-scheduler-container-ff4c6c1e | nova | enabled | up    | 2018-02-14T15:37:21.000000 |
-      | cinder-volume    | ubuntu-xenial@lvm                        | nova | enabled | up    | 2018-02-14T15:37:25.000000 |
-      | cinder-backup    | ubuntu-xenial                            | nova | enabled | up    | 2018-02-14T15:37:21.000000 |
+      | cinder-volume    | ubuntu-bionic@lvm                        | nova | enabled | up    | 2018-02-14T15:37:25.000000 |
+      | cinder-backup    | ubuntu-bionic                            | nova | enabled | up    | 2018-02-14T15:37:21.000000 |
       +------------------+------------------------------------------+------+---------+-------+----------------------------+
 
 #. Run an OpenStack command to ensure the image storage service is

diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml
@@ -45,11 +45,10 @@
       assert:
         that:
           - (ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch') or
-            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or
             (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic') 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, Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic),  CentOS 7 (WIP) and openSUSE Leap 42.X and openSUSE Leap 15.X"
+        msg: "The only supported platforms for this release are Debian Stretch, Ubuntu 18.04 LTS (Bionic),  CentOS 7 (WIP) and openSUSE Leap 42.X and openSUSE Leap 15.X"
 
     - include_tasks: common-tasks/package-cache-proxy.yml
       when: install_method == "source"

diff --git a/playbooks/roles/system_crontab_coordination/meta/main.yml b/playbooks/roles/system_crontab_coordination/meta/main.yml
@@ -22,7 +22,7 @@ galaxy_info:
   platforms:
   - name: Ubuntu
     versions:
-    - xenial
+    - bionic
   categories:
     - cloud
     - openstack
diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml
@@ -17,13 +17,12 @@
   assert:
     that:
       - (ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch') or
-        (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or
         (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic') 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: >-
-      The only supported platforms for this release are Debian Stretch, Ubuntu 16.04 LTS (Xenial),
-      Ubuntu 18.04 LTS (Bionic), CentOS 7, openSUSE Leap 42.X and openSUSE Leap 15.X
+      The only supported platforms for this release are Debian Stretch, Ubuntu 18.04 LTS (Bionic),
+      Centos 7, openSUSE Leap 42.X and openSUSE Leap 15.X
   when: (check_operating_system | default(True))| bool
   tags:
     - check-operating-system