From 7080ccfc3d70e5f11b18e0681d604c5e689ee0be Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 22 Oct 2021 11:58:39 +0200
Subject: [PATCH] Add Rocky Linux support as Host OS

Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/831642
Change-Id: I70dcd2d0cade52a23b3e219b7e0aaa31193ec938
---
 ansible/roles/prechecks/vars/main.yml                  |  2 ++
 doc/source/user/support-matrix.rst                     |  1 +
 .../notes/support-rockylinux-ad6d48db054ead2b.yaml     |  4 ++++
 tests/pre.yml                                          |  1 +
 zuul.d/jobs.yaml                                       | 10 ++++++++++
 zuul.d/nodesets.yaml                                   |  6 ++++++
 zuul.d/project.yaml                                    |  1 +
 7 files changed, 25 insertions(+)
 create mode 100644 releasenotes/notes/support-rockylinux-ad6d48db054ead2b.yaml

diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml
index 2a131f3fc2..941ac268af 100644
--- a/ansible/roles/prechecks/vars/main.yml
+++ b/ansible/roles/prechecks/vars/main.yml
@@ -15,5 +15,7 @@ host_os_distributions:
     - "bullseye"
   RHEL:
     - "8"
+  Rocky:
+    - "8"
   Ubuntu:
     - "focal"
diff --git a/doc/source/user/support-matrix.rst b/doc/source/user/support-matrix.rst
index a57f95fa6b..eeec537bac 100644
--- a/doc/source/user/support-matrix.rst
+++ b/doc/source/user/support-matrix.rst
@@ -24,6 +24,7 @@ Kolla Ansible supports the following host Operating Systems (OS):
 * CentOS Stream 8
 * Debian Bullseye (11)
 * RHEL 8 (deprecated)
+* Rocky Linux 8
 * Ubuntu Focal (20.04)
 
 Supported container images
diff --git a/releasenotes/notes/support-rockylinux-ad6d48db054ead2b.yaml b/releasenotes/notes/support-rockylinux-ad6d48db054ead2b.yaml
new file mode 100644
index 0000000000..35ea220167
--- /dev/null
+++ b/releasenotes/notes/support-rockylinux-ad6d48db054ead2b.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Adds support for Rocky Linux 8 as Host OS.
diff --git a/tests/pre.yml b/tests/pre.yml
index 5644279637..372074edde 100644
--- a/tests/pre.yml
+++ b/tests/pre.yml
@@ -81,6 +81,7 @@
     - name: set new hostname based on ansible inventory file
       hostname:
         name: "{{ inventory_hostname }}"
+        use: systemd
       become: true
 
     - name: Wait for ntp time sync
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 536c65da17..1bd8b3e0a1 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -26,6 +26,16 @@
       install_type: source
       tls_enabled: true
 
+- job:
+    name: kolla-ansible-rocky8-source
+    parent: kolla-ansible-base
+    nodeset: kolla-ansible-rocky-8
+    voting: false
+    vars:
+      base_distro: centos
+      install_type: source
+      tls_enabled: true
+
 - job:
     name: kolla-ansible-ubuntu-source
     parent: kolla-ansible-base
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index a448111341..7bcc6ebbd7 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -33,6 +33,12 @@
       - name: secondary2
         label: debian-bullseye
 
+- nodeset:
+    name: kolla-ansible-rocky-8
+    nodes:
+      - name: primary
+        label: rockylinux-8
+
 - nodeset:
     name: kolla-ansible-focal-multi
     nodes:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 6431136292..1f51d44e3e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -12,6 +12,7 @@
       jobs:
         - kolla-ansible-centos8s-source
         - kolla-ansible-debian-source
+        - kolla-ansible-rocky8-source
         - kolla-ansible-ubuntu-source
         - kolla-ansible-centos8s-source-kvm
         - kolla-ansible-ubuntu-source-kvm