From ccdfa1d02d21a21cf68ddcf7a117966cc43252a0 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 27 May 2020 17:03:21 +0200 Subject: [PATCH] Support Debian Buster and add CI jobs for it Let us extend our supported OS coverage! I also suspect this patch fixes Debian Stretch support since all required changes seem to apply to it as well. Change-Id: I233082dff072ab7033ff68fce7f7b92ad557de80 --- doc/source/install/index.rst | 1 + .../roles/bifrost-configdrives-dynamic/meta/main.yml | 1 + playbooks/roles/bifrost-create-dib-image/meta/main.yml | 1 + .../defaults/required_defaults_Debian.yml | 4 ++-- playbooks/roles/bifrost-create-vm-nodes/meta/main.yml | 1 + .../roles/bifrost-deploy-nodes-dynamic/meta/main.yml | 1 + .../defaults/required_defaults_Debian_family.yml | 6 +++--- .../defaults/required_defaults_Debian_family.yml | 6 +++--- releasenotes/notes/debian-buster-dd7cfde9908deb09.yaml | 4 ++++ zuul.d/bifrost-jobs.yaml | 10 ++++++++++ zuul.d/project.yaml | 4 ++++ 11 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/debian-buster-dd7cfde9908deb09.yaml diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index cab4296be..e193d111b 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -25,6 +25,7 @@ Supported operating systems: * CentOS 8 * openSUSE Leap 15.1 * Fedora 30 +* Debian Buster If you want to try Bifrost on a virtual environment, see :doc:`/contributor/testenv`. diff --git a/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml b/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml index 11d60f5d0..de0b1df8a 100644 --- a/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml +++ b/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml @@ -16,6 +16,7 @@ galaxy_info: - name: Debian versions: - stretch + - buster categories: - cloud - cloud:openstack diff --git a/playbooks/roles/bifrost-create-dib-image/meta/main.yml b/playbooks/roles/bifrost-create-dib-image/meta/main.yml index 4fce3c619..8725ea968 100644 --- a/playbooks/roles/bifrost-create-dib-image/meta/main.yml +++ b/playbooks/roles/bifrost-create-dib-image/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: - name: Debian versions: - stretch + - buster - name: Ubuntu versions: - xenial diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml index 98776a912..61a3085ef 100644 --- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml +++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml @@ -1,9 +1,9 @@ --- sgabios_dir: /usr/share/qemu/ -libvirt_service_name: libvirt-bin +libvirt_service_name: libvirtd required_packages: - g++ - - libvirt-bin + - libvirt-daemon-system - libxslt1-dev - libxml2-dev - qemu-utils diff --git a/playbooks/roles/bifrost-create-vm-nodes/meta/main.yml b/playbooks/roles/bifrost-create-vm-nodes/meta/main.yml index c8b91c9d3..bd880d2cb 100644 --- a/playbooks/roles/bifrost-create-vm-nodes/meta/main.yml +++ b/playbooks/roles/bifrost-create-vm-nodes/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: - name: Debian versions: - stretch + - buster - name: Ubuntu versions: - xenial diff --git a/playbooks/roles/bifrost-deploy-nodes-dynamic/meta/main.yml b/playbooks/roles/bifrost-deploy-nodes-dynamic/meta/main.yml index 68aa7deda..c7b7567ce 100644 --- a/playbooks/roles/bifrost-deploy-nodes-dynamic/meta/main.yml +++ b/playbooks/roles/bifrost-deploy-nodes-dynamic/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: - name: Debian versions: - stretch + - buster - name: Ubuntu versions: - xenial diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml index a7b5c53e9..1e117d4db 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml @@ -1,7 +1,7 @@ --- -init_template: upstart_template.j2 -init_dest_dir: /etc/init/ -init_ext: .conf +init_template: systemd_template.j2 +init_dest_dir: /lib/systemd/system/ +init_ext: .service ipxe_dir: /usr/lib/ipxe/ ipxe_full_binary: ipxe.pxe ironic_rootwrap_dir: /usr/local/bin/ diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml index 021cf4a00..a18886934 100644 --- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml +++ b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml @@ -1,7 +1,7 @@ --- -init_template: upstart_template.j2 -init_dest_dir: /etc/init/ -init_ext: .conf +init_template: systemd_template.j2 +init_dest_dir: /lib/systemd/system/ +init_ext: .service nginx_user: www-data mysql_service_name: mysql required_packages: diff --git a/releasenotes/notes/debian-buster-dd7cfde9908deb09.yaml b/releasenotes/notes/debian-buster-dd7cfde9908deb09.yaml new file mode 100644 index 000000000..5805870ea --- /dev/null +++ b/releasenotes/notes/debian-buster-dd7cfde9908deb09.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Debian Buster is now supported as a base operating system. diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml index 4018adef3..83b5ccb44 100644 --- a/zuul.d/bifrost-jobs.yaml +++ b/zuul.d/bifrost-jobs.yaml @@ -58,6 +58,11 @@ vars: use_venv: true +- job: + name: bifrost-integration-dhcp-debian-buster + parent: bifrost-integration-dhcp + nodeset: debian-buster + - job: name: bifrost-integration-dibipa-debian parent: bifrost-integration @@ -104,6 +109,11 @@ parent: bifrost-integration-tinyipa nodeset: centos-8 +- job: + name: bifrost-integration-tinyipa-debian-buster + parent: bifrost-integration-tinyipa + nodeset: debian-buster + - job: name: bifrost-integration-tinyipa-opensuse-15 parent: bifrost-integration-tinyipa diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 5d03c4b2c..80e6f976a 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -15,6 +15,8 @@ voting: false - bifrost-integration-tinyipa-fedora-latest: voting: false + - bifrost-integration-tinyipa-debian-buster: + voting: false - bifrost-integration-dhcp-ubuntu-bionic: voting: false - bifrost-integration-dibipa-debian-ubuntu-bionic: @@ -27,6 +29,8 @@ voting: false - bifrost-integration-dibipa-debian-opensuse-15: voting: false + - bifrost-integration-dhcp-debian-buster: + voting: false gate: jobs: - bifrost-integration-tinyipa-ubuntu-bionic