From 352f91ac1077d557d833b199cb5a5d489e96437f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 28 Jul 2020 12:07:51 +0200 Subject: [PATCH] ubuntu: move to 20.04 Focal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is a time once every 2 years when ubuntu team releases new LTS release. And then UCA joins with binary packages for current OpenStack development cycle. It is this time for Ubuntu 20.04 'focal'. Includes CI fix to pass: [CI] Temporarily block new Ansible The proper fix [1] needs fixing older branches before newer. This one allows to fix CI first, in the usual order. To revert after [1] gets merged in all relevant branches. [1] https://review.opendev.org/745648 Old-Change-Id: Ifbd37d8addd4322773118e2e9d46494741a8ae66 Related-Bug: #1891145 Depends-on: https://review.opendev.org/#/c/738994/ Change-Id: Ib8b70ee40ec2d19509cc84c0f530612f81907721 Co-Authored-By: Radosław Piliszek --- ansible/group_vars/all.yml | 2 +- ansible/roles/prechecks/vars/main.yml | 1 + doc/source/user/quickstart.rst | 2 +- doc/source/user/support-matrix.rst | 2 +- tests/run.yml | 2 +- zuul.d/jobs.yaml | 28 +++++++++++++-------------- zuul.d/nodesets.yaml | 18 +++++++++++------ 7 files changed, 31 insertions(+), 24 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index a59c398c7a..57c4d40cbb 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -1047,7 +1047,7 @@ distro_python_version_map: { "centos": "3.6", "debian": "3.7", "rhel": "3.6", - "ubuntu": "3.6" + "ubuntu": "3.8" } distro_python_version: "{{ distro_python_version_map[kolla_base_distro] }}" diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index 5fbffcb478..558696e05b 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -17,3 +17,4 @@ host_os_distributions: - "8" Ubuntu: - "bionic" + - "focal" diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index f6412df8b9..da1b5447d7 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -371,7 +371,7 @@ There are a few options that are required to deploy Kolla-Ansible: - Debian - RHEL - For newcomers, we recommend to use CentOS 8 or Ubuntu 18.04. + For newcomers, we recommend to use CentOS 8 or Ubuntu 20.04. .. code-block:: console diff --git a/doc/source/user/support-matrix.rst b/doc/source/user/support-matrix.rst index 945d56405d..2acb602b11 100644 --- a/doc/source/user/support-matrix.rst +++ b/doc/source/user/support-matrix.rst @@ -15,7 +15,7 @@ Kolla Ansible supports the following host Operating Systems (OS): * CentOS 8 * Debian Buster (10) * RHEL 8 -* Ubuntu Bionic (18.04) +* Ubuntu Focal (20.04) Supported container images ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/run.yml b/tests/run.yml index a7f0be9fea..de2ca429fe 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -175,7 +175,7 @@ - name: install kolla-ansible and dependencies vars: # Test latest ansible version on Ubuntu, minimum supported on others. - ansible_version_constraint: "{{ '==2.9.*,!=2.9.8' if base_distro == 'ubuntu' else '==2.8.*' }}" + ansible_version_constraint: "{{ '==2.9.*,!=2.9.8,!=2.9.12' if base_distro == 'ubuntu' else '==2.8.*,!=2.8.14' }}" pip: name: - "{{ kolla_ansible_src_dir }}" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index b9d0d8b6ca..5901c646c8 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -30,7 +30,7 @@ - job: name: kolla-ansible-ubuntu-source parent: kolla-ansible-base - nodeset: kolla-ansible-bionic + nodeset: kolla-ansible-focal vars: base_distro: ubuntu install_type: source @@ -47,7 +47,7 @@ - job: name: kolla-ansible-ubuntu-source-kvm parent: kolla-ansible-kvm-base - nodeset: kolla-ansible-bionic-nested-virt + nodeset: kolla-ansible-focal-nested-virt vars: base_distro: ubuntu install_type: source @@ -55,7 +55,7 @@ - job: name: kolla-ansible-ubuntu-source-multinode-ipv6 parent: kolla-ansible-ipv6-base - nodeset: kolla-ansible-bionic-multi + nodeset: kolla-ansible-focal-multi vars: base_distro: ubuntu install_type: source @@ -72,7 +72,7 @@ - job: name: kolla-ansible-ubuntu-binary parent: kolla-ansible-base - nodeset: kolla-ansible-bionic + nodeset: kolla-ansible-focal voting: false vars: base_distro: ubuntu @@ -90,7 +90,7 @@ - job: name: kolla-ansible-ubuntu-source-ceph-ansible parent: kolla-ansible-ceph-ansible-base - nodeset: kolla-ansible-bionic-multi + nodeset: kolla-ansible-focal-multi timeout: 9000 vars: base_distro: ubuntu @@ -107,7 +107,7 @@ - job: name: kolla-ansible-ubuntu-source-mariadb parent: kolla-ansible-mariadb-base - nodeset: kolla-ansible-bionic-multi + nodeset: kolla-ansible-focal-multi vars: base_distro: ubuntu install_type: source @@ -186,7 +186,7 @@ - job: name: kolla-ansible-ubuntu-source-zun parent: kolla-ansible-zun-base - nodeset: kolla-ansible-bionic-multi + nodeset: kolla-ansible-focal-multi vars: base_distro: ubuntu install_type: source @@ -202,7 +202,7 @@ - job: name: kolla-ansible-ubuntu-source-swift parent: kolla-ansible-swift-base - nodeset: kolla-ansible-bionic-multi + nodeset: kolla-ansible-focal-multi vars: base_distro: ubuntu install_type: source @@ -234,7 +234,7 @@ - job: name: kolla-ansible-ubuntu-source-ironic parent: kolla-ansible-ironic-base - nodeset: kolla-ansible-bionic + nodeset: kolla-ansible-focal vars: base_distro: ubuntu install_type: source @@ -244,7 +244,7 @@ - job: name: kolla-ansible-ubuntu-binary-ironic parent: kolla-ansible-ironic-base - nodeset: kolla-ansible-bionic + nodeset: kolla-ansible-focal vars: base_distro: ubuntu install_type: binary @@ -252,7 +252,7 @@ - job: name: kolla-ansible-ubuntu-source-masakari parent: kolla-ansible-masakari-base - nodeset: kolla-ansible-bionic + nodeset: kolla-ansible-focal vars: base_distro: ubuntu install_type: source @@ -276,7 +276,7 @@ - job: name: kolla-ansible-ubuntu-source-linuxbridge parent: kolla-ansible-linuxbridge-base - nodeset: kolla-ansible-bionic + nodeset: kolla-ansible-focal vars: base_distro: ubuntu install_type: source @@ -292,7 +292,7 @@ - job: name: kolla-ansible-ubuntu-source-ovn parent: kolla-ansible-ovn-base - nodeset: kolla-ansible-bionic-multi + nodeset: kolla-ansible-focal-multi vars: base_distro: ubuntu install_type: source @@ -308,7 +308,7 @@ - job: name: kolla-ansible-ubuntu-source-prometheus-efk parent: kolla-ansible-prometheus-efk-base - nodeset: kolla-ansible-bionic + nodeset: kolla-ansible-focal vars: base_distro: ubuntu install_type: source diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index f5ed9ab7ee..09f9077995 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -24,14 +24,20 @@ label: ubuntu-bionic - nodeset: - name: kolla-ansible-bionic-multi + name: kolla-ansible-focal nodes: - name: primary - label: ubuntu-bionic + label: ubuntu-focal + +- nodeset: + name: kolla-ansible-focal-multi + nodes: + - name: primary + label: ubuntu-focal - name: secondary1 - label: ubuntu-bionic + label: ubuntu-focal - name: secondary2 - label: ubuntu-bionic + label: ubuntu-focal groups: - name: switch nodes: @@ -60,10 +66,10 @@ - secondary2 - nodeset: - name: kolla-ansible-bionic-nested-virt + name: kolla-ansible-focal-nested-virt nodes: - name: primary - label: nested-virt-ubuntu-bionic + label: nested-virt-ubuntu-focal - nodeset: name: kolla-ansible-centos8-nested-virt