ubuntu: move to 20.04 Focal
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 <radoslaw.piliszek@gmail.com>
This commit is contained in:
parent
0a6a30b77a
commit
352f91ac10
@ -1047,7 +1047,7 @@ distro_python_version_map: {
|
|||||||
"centos": "3.6",
|
"centos": "3.6",
|
||||||
"debian": "3.7",
|
"debian": "3.7",
|
||||||
"rhel": "3.6",
|
"rhel": "3.6",
|
||||||
"ubuntu": "3.6"
|
"ubuntu": "3.8"
|
||||||
}
|
}
|
||||||
|
|
||||||
distro_python_version: "{{ distro_python_version_map[kolla_base_distro] }}"
|
distro_python_version: "{{ distro_python_version_map[kolla_base_distro] }}"
|
||||||
|
@ -17,3 +17,4 @@ host_os_distributions:
|
|||||||
- "8"
|
- "8"
|
||||||
Ubuntu:
|
Ubuntu:
|
||||||
- "bionic"
|
- "bionic"
|
||||||
|
- "focal"
|
||||||
|
@ -371,7 +371,7 @@ There are a few options that are required to deploy Kolla-Ansible:
|
|||||||
- Debian
|
- Debian
|
||||||
- RHEL
|
- 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
|
.. code-block:: console
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ Kolla Ansible supports the following host Operating Systems (OS):
|
|||||||
* CentOS 8
|
* CentOS 8
|
||||||
* Debian Buster (10)
|
* Debian Buster (10)
|
||||||
* RHEL 8
|
* RHEL 8
|
||||||
* Ubuntu Bionic (18.04)
|
* Ubuntu Focal (20.04)
|
||||||
|
|
||||||
Supported container images
|
Supported container images
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
@ -175,7 +175,7 @@
|
|||||||
- name: install kolla-ansible and dependencies
|
- name: install kolla-ansible and dependencies
|
||||||
vars:
|
vars:
|
||||||
# Test latest ansible version on Ubuntu, minimum supported on others.
|
# 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:
|
pip:
|
||||||
name:
|
name:
|
||||||
- "{{ kolla_ansible_src_dir }}"
|
- "{{ kolla_ansible_src_dir }}"
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source
|
name: kolla-ansible-ubuntu-source
|
||||||
parent: kolla-ansible-base
|
parent: kolla-ansible-base
|
||||||
nodeset: kolla-ansible-bionic
|
nodeset: kolla-ansible-focal
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
@ -47,7 +47,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-kvm
|
name: kolla-ansible-ubuntu-source-kvm
|
||||||
parent: kolla-ansible-kvm-base
|
parent: kolla-ansible-kvm-base
|
||||||
nodeset: kolla-ansible-bionic-nested-virt
|
nodeset: kolla-ansible-focal-nested-virt
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
@ -55,7 +55,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-multinode-ipv6
|
name: kolla-ansible-ubuntu-source-multinode-ipv6
|
||||||
parent: kolla-ansible-ipv6-base
|
parent: kolla-ansible-ipv6-base
|
||||||
nodeset: kolla-ansible-bionic-multi
|
nodeset: kolla-ansible-focal-multi
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
@ -72,7 +72,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-binary
|
name: kolla-ansible-ubuntu-binary
|
||||||
parent: kolla-ansible-base
|
parent: kolla-ansible-base
|
||||||
nodeset: kolla-ansible-bionic
|
nodeset: kolla-ansible-focal
|
||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
@ -90,7 +90,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-ceph-ansible
|
name: kolla-ansible-ubuntu-source-ceph-ansible
|
||||||
parent: kolla-ansible-ceph-ansible-base
|
parent: kolla-ansible-ceph-ansible-base
|
||||||
nodeset: kolla-ansible-bionic-multi
|
nodeset: kolla-ansible-focal-multi
|
||||||
timeout: 9000
|
timeout: 9000
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
@ -107,7 +107,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-mariadb
|
name: kolla-ansible-ubuntu-source-mariadb
|
||||||
parent: kolla-ansible-mariadb-base
|
parent: kolla-ansible-mariadb-base
|
||||||
nodeset: kolla-ansible-bionic-multi
|
nodeset: kolla-ansible-focal-multi
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
@ -186,7 +186,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-zun
|
name: kolla-ansible-ubuntu-source-zun
|
||||||
parent: kolla-ansible-zun-base
|
parent: kolla-ansible-zun-base
|
||||||
nodeset: kolla-ansible-bionic-multi
|
nodeset: kolla-ansible-focal-multi
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
@ -202,7 +202,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-swift
|
name: kolla-ansible-ubuntu-source-swift
|
||||||
parent: kolla-ansible-swift-base
|
parent: kolla-ansible-swift-base
|
||||||
nodeset: kolla-ansible-bionic-multi
|
nodeset: kolla-ansible-focal-multi
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
@ -234,7 +234,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-ironic
|
name: kolla-ansible-ubuntu-source-ironic
|
||||||
parent: kolla-ansible-ironic-base
|
parent: kolla-ansible-ironic-base
|
||||||
nodeset: kolla-ansible-bionic
|
nodeset: kolla-ansible-focal
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
@ -244,7 +244,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-binary-ironic
|
name: kolla-ansible-ubuntu-binary-ironic
|
||||||
parent: kolla-ansible-ironic-base
|
parent: kolla-ansible-ironic-base
|
||||||
nodeset: kolla-ansible-bionic
|
nodeset: kolla-ansible-focal
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: binary
|
install_type: binary
|
||||||
@ -252,7 +252,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-masakari
|
name: kolla-ansible-ubuntu-source-masakari
|
||||||
parent: kolla-ansible-masakari-base
|
parent: kolla-ansible-masakari-base
|
||||||
nodeset: kolla-ansible-bionic
|
nodeset: kolla-ansible-focal
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
@ -276,7 +276,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-linuxbridge
|
name: kolla-ansible-ubuntu-source-linuxbridge
|
||||||
parent: kolla-ansible-linuxbridge-base
|
parent: kolla-ansible-linuxbridge-base
|
||||||
nodeset: kolla-ansible-bionic
|
nodeset: kolla-ansible-focal
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
@ -292,7 +292,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-ovn
|
name: kolla-ansible-ubuntu-source-ovn
|
||||||
parent: kolla-ansible-ovn-base
|
parent: kolla-ansible-ovn-base
|
||||||
nodeset: kolla-ansible-bionic-multi
|
nodeset: kolla-ansible-focal-multi
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
@ -308,7 +308,7 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-ubuntu-source-prometheus-efk
|
name: kolla-ansible-ubuntu-source-prometheus-efk
|
||||||
parent: kolla-ansible-prometheus-efk-base
|
parent: kolla-ansible-prometheus-efk-base
|
||||||
nodeset: kolla-ansible-bionic
|
nodeset: kolla-ansible-focal
|
||||||
vars:
|
vars:
|
||||||
base_distro: ubuntu
|
base_distro: ubuntu
|
||||||
install_type: source
|
install_type: source
|
||||||
|
@ -24,14 +24,20 @@
|
|||||||
label: ubuntu-bionic
|
label: ubuntu-bionic
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: kolla-ansible-bionic-multi
|
name: kolla-ansible-focal
|
||||||
nodes:
|
nodes:
|
||||||
- name: primary
|
- name: primary
|
||||||
label: ubuntu-bionic
|
label: ubuntu-focal
|
||||||
|
|
||||||
|
- nodeset:
|
||||||
|
name: kolla-ansible-focal-multi
|
||||||
|
nodes:
|
||||||
|
- name: primary
|
||||||
|
label: ubuntu-focal
|
||||||
- name: secondary1
|
- name: secondary1
|
||||||
label: ubuntu-bionic
|
label: ubuntu-focal
|
||||||
- name: secondary2
|
- name: secondary2
|
||||||
label: ubuntu-bionic
|
label: ubuntu-focal
|
||||||
groups:
|
groups:
|
||||||
- name: switch
|
- name: switch
|
||||||
nodes:
|
nodes:
|
||||||
@ -60,10 +66,10 @@
|
|||||||
- secondary2
|
- secondary2
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: kolla-ansible-bionic-nested-virt
|
name: kolla-ansible-focal-nested-virt
|
||||||
nodes:
|
nodes:
|
||||||
- name: primary
|
- name: primary
|
||||||
label: nested-virt-ubuntu-bionic
|
label: nested-virt-ubuntu-focal
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: kolla-ansible-centos8-nested-virt
|
name: kolla-ansible-centos8-nested-virt
|
||||||
|
Loading…
Reference in New Issue
Block a user