From e35293bb89e7f375fdba99643688f580582f485c Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Wed, 3 Jun 2020 09:37:41 +0200
Subject: [PATCH] Support Ubuntu Focal (20.04)

Change-Id: Ic0f88bb979d599b5298cc53033212547a878392b
---
 doc/source/install/index.rst                       |  2 +-
 .../defaults/required_defaults_Ubuntu_20.04.yml    | 14 ++++++++++++++
 .../roles/bifrost-create-vm-nodes/tasks/main.yml   |  1 +
 releasenotes/notes/focal-36208207a571f354.yaml     |  4 ++++
 zuul.d/bifrost-jobs.yaml                           |  5 +++++
 zuul.d/project.yaml                                |  2 ++
 6 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Ubuntu_20.04.yml
 create mode 100644 releasenotes/notes/focal-36208207a571f354.yaml

diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index 05ff05af2..cfa1be0d5 100644
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -20,7 +20,7 @@ Installation and use of bifrost is split into roughly three steps:
 
 Supported operating systems:
 
-* Ubuntu 18.04
+* Ubuntu 18.04, 20.04
 * Red Hat Enterprise Linux (RHEL) 8
 * CentOS 8
 * openSUSE Leap 15.1
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Ubuntu_20.04.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Ubuntu_20.04.yml
new file mode 100644
index 000000000..4dd2f8fe6
--- /dev/null
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Ubuntu_20.04.yml
@@ -0,0 +1,14 @@
+---
+sgabios_dir: /usr/share/qemu/
+libvirt_service_name: libvirtd
+required_packages:
+ - g++
+ - libvirt-daemon-system
+ - libxslt1-dev
+ - libxml2-dev
+ - qemu-utils
+ - qemu-kvm
+ - qemu-system-x86
+ - qemu-system-data
+ - pkg-config
+ - libvirt-dev
diff --git a/playbooks/roles/bifrost-create-vm-nodes/tasks/main.yml b/playbooks/roles/bifrost-create-vm-nodes/tasks/main.yml
index ba70f9703..753966ef7 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/tasks/main.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/tasks/main.yml
@@ -63,6 +63,7 @@
   include_vars: "{{ item }}"
   with_first_found:
     - "../defaults/required_defaults_{{ ansible_distribution }}_{{ ansible_distribution_release }}.yml"
+    - "../defaults/required_defaults_{{ ansible_distribution }}_{{ ansible_distribution_version }}.yml"
     - "../defaults/dummy-defaults.yml"
 # NOTE(cinerama): On Fedora 22, ansible 1.9, ansible_pkg_mgr
 # defaults to yum, which may not be installed. This can be safely
diff --git a/releasenotes/notes/focal-36208207a571f354.yaml b/releasenotes/notes/focal-36208207a571f354.yaml
new file mode 100644
index 000000000..a599bbd97
--- /dev/null
+++ b/releasenotes/notes/focal-36208207a571f354.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Ubuntu Focal (20.04) is now supported as a base operating system.
diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml
index 83b5ccb44..e75d5445e 100644
--- a/zuul.d/bifrost-jobs.yaml
+++ b/zuul.d/bifrost-jobs.yaml
@@ -104,6 +104,11 @@
     vars:
       enable_keystone: true
 
+- job:
+    name: bifrost-integration-tinyipa-ubuntu-focal
+    parent: bifrost-integration-tinyipa
+    nodeset: ubuntu-focal
+
 - job:
     name: bifrost-integration-tinyipa-centos-8
     parent: bifrost-integration-tinyipa
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 80e6f976a..c73ca7be0 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -11,6 +11,8 @@
         - bifrost-integration-tinyipa-centos-8
         - bifrost-integration-tinyipa-keystone-ubuntu-bionic
         # Non-voting jobs
+        - bifrost-integration-tinyipa-ubuntu-focal:
+            voting: false
         - bifrost-integration-tinyipa-opensuse-15:
             voting: false
         - bifrost-integration-tinyipa-fedora-latest: