diff --git a/doc/source/user/aio/quickstart.rst b/doc/source/user/aio/quickstart.rst index e5e9475a0c..4a479e6b87 100644 --- a/doc/source/user/aio/quickstart.rst +++ b/doc/source/user/aio/quickstart.rst @@ -126,8 +126,8 @@ version. .. note:: The |current_release_formal_name| release is only compatible with - Debian 9 (stretch), Ubuntu 18.04 (Bionic Beaver), CentOS 7 - and openSUSE Leap 15.X. + Debian 9 (stretch), Debian 10 (buster), Ubuntu 18.04 (Bionic Beaver), + CentOS 7 and openSUSE Leap 15.X. The next step is to bootstrap Ansible and the Ansible roles for the development environment. diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index e09f140ccb..c0abc76d36 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -45,10 +45,11 @@ assert: that: - (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_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 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 or Buster, 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/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 6083447835..2b8823588e 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -78,6 +78,13 @@ case ${DISTRO_ID} in if `/bin/grep -q "stretch" /etc/os-release` && [ -f "/etc/apt/sources.list.d/security.list" ]; then echo "deb http://security.debian.org stretch/updates main contrib" > /etc/apt/sources.list.d/security.list fi + # NOTE(jrosser) remove this once infra debian repos are fixed for buster + if `/bin/grep -q "buster" /etc/os-release` && [ -f "/etc/apt/sources.list.d/security.list" ]; then + echo "deb http://deb.debian.org/debian buster main" > /etc/apt/sources.list.d/default.list + echo "deb http://deb.debian.org/debian buster-backports" main > /etc/apt/sources.list.d/backports.list + echo "deb http://security.debian.org buster/updates main contrib" > /etc/apt/sources.list.d/security.list + echo "deb http://deb.debian.org/debian buster-updates main" > /etc/apt/sources.list.d/updates.list + fi apt-get update DEBIAN_FRONTEND=noninteractive apt-get -y install \ git-core curl gcc netcat \ diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml index 0f7e67e7d1..478cd73446 100644 --- a/tests/roles/bootstrap-host/tasks/check-requirements.yml +++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml @@ -17,6 +17,7 @@ assert: that: - (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_os_family == 'RedHat' and ansible_distribution_major_version == '7') or (ansible_os_family == 'Suse' and ansible_distribution_major_version in ['42', '15']) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 37cf4736e4..3a1379360c 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -132,9 +132,9 @@ # debian - job: - name: openstack-ansible-deploy-aio_metal-debian-stable + name: openstack-ansible-deploy-aio_metal-debian-buster parent: openstack-ansible-deploy-aio - nodeset: debian-stable + nodeset: debian-buster # ubuntu - job: @@ -276,14 +276,14 @@ # debian - job: - name: openstack-ansible-deploy-aio_telemetry_metal-debian-stable + name: openstack-ansible-deploy-aio_telemetry_metal-debian-buster parent: openstack-ansible-deploy-aio - nodeset: debian-stable + nodeset: debian-buster - job: - name: openstack-ansible-deploy-aio_lxc-debian-stable + name: openstack-ansible-deploy-aio_lxc-debian-buster parent: openstack-ansible-deploy-aio - nodeset: debian-stable + nodeset: debian-buster # opensuse - job: diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 55d453c01e..ac03183c38 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -39,12 +39,12 @@ check: jobs: - openstack-ansible-deploy-aio_lxc-centos-7 - - openstack-ansible-deploy-aio_lxc-debian-stable + - openstack-ansible-deploy-aio_lxc-debian-buster - openstack-ansible-deploy-aio_lxc-ubuntu-bionic gate: jobs: - openstack-ansible-deploy-aio_lxc-centos-7 - - openstack-ansible-deploy-aio_lxc-debian-stable + - openstack-ansible-deploy-aio_lxc-debian-buster - openstack-ansible-deploy-aio_lxc-ubuntu-bionic periodic: jobs: @@ -66,7 +66,7 @@ name: openstack-ansible-deploy-aio_metal-jobs check: jobs: - - openstack-ansible-deploy-aio_metal-debian-stable + - openstack-ansible-deploy-aio_metal-debian-buster - openstack-ansible-deploy-aio_metal-centos-7 - openstack-ansible-deploy-aio_metal-opensuse-15 - openstack-ansible-deploy-aio_metal-ubuntu-bionic @@ -74,7 +74,7 @@ - openstack-ansible-upgrade-aio_metal-ubuntu-bionic gate: jobs: - - openstack-ansible-deploy-aio_metal-debian-stable + - openstack-ansible-deploy-aio_metal-debian-buster - openstack-ansible-deploy-aio_metal-centos-7 - openstack-ansible-deploy-aio_metal-opensuse-15 - openstack-ansible-deploy-aio_metal-ubuntu-bionic @@ -89,12 +89,12 @@ check: jobs: - openstack-ansible-deploy-aio_telemetry_metal-centos-7 - - openstack-ansible-deploy-aio_telemetry_metal-debian-stable + - openstack-ansible-deploy-aio_telemetry_metal-debian-buster - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic gate: jobs: - openstack-ansible-deploy-aio_telemetry_metal-centos-7 - - openstack-ansible-deploy-aio_telemetry_metal-debian-stable + - openstack-ansible-deploy-aio_telemetry_metal-debian-buster - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic experimental: jobs: