Skip to content

Commit 766548f

Browse files
authored
Merge pull request #206 from stackhpc/feature/wallaby/rocky-clean-version
Add Rocky Linux support as Host OS
2 parents 57d7ad5 + 986c23b commit 766548f

File tree

8 files changed

+30
-1
lines changed

8 files changed

+30
-1
lines changed

ansible/roles/baremetal/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ docker_apt_key_id: "0EBFCD88"
1010
docker_apt_package: "docker-ce"
1111

1212
# Docker Yum repository configuration.
13-
docker_yum_url: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}"
13+
docker_yum_url: "https://download.docker.com/linux/centos"
1414
docker_yum_baseurl: "{{ docker_yum_url }}/$releasever/$basearch/stable"
1515
docker_yum_gpgkey: "{{ docker_yum_url }}/gpg"
1616
docker_yum_gpgcheck: true

ansible/roles/prechecks/vars/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ host_os_distributions:
1616
- "bullseye"
1717
RHEL:
1818
- "8"
19+
Rocky:
20+
- "8"
1921
Ubuntu:
2022
- "focal"

doc/source/user/support-matrix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Kolla Ansible supports the following host Operating Systems (OS):
2424
* CentOS Stream 8
2525
* Debian Bullseye (11)
2626
* RHEL 8 (deprecated)
27+
* Rocky Linux 8
2728
* Ubuntu Focal (20.04)
2829

2930
Supported container images
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
features:
3+
- |
4+
Adds support for Rocky Linux 8 as Host OS.

tests/pre.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
- name: set new hostname based on ansible inventory file
9696
hostname:
9797
name: "{{ inventory_hostname }}"
98+
use: systemd
9899
become: true
99100

100101
- name: Wait for ntp time sync

zuul.d/jobs.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@
2727
install_type: source
2828
tls_enabled: true
2929

30+
- job:
31+
name: kolla-ansible-rocky8-source
32+
parent: kolla-ansible-base
33+
nodeset: kolla-ansible-rocky-8
34+
voting: false
35+
vars:
36+
base_distro: centos
37+
install_type: source
38+
tls_enabled: true
39+
3040
- job:
3141
name: kolla-ansible-ubuntu-source
3242
parent: kolla-ansible-base

zuul.d/nodesets.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@
3535
- name: primary
3636
label: ubuntu-focal
3737

38+
- nodeset:
39+
name: kolla-ansible-debian-bullseye-multi
40+
nodes:
41+
- name: primary
42+
label: debian-bullseye
43+
- name: secondary1
44+
label: debian-bullseye
45+
- name: secondary2
46+
label: debian-bullseye
47+
3848
- nodeset:
3949
name: kolla-ansible-focal-multi
4050
nodes:

zuul.d/project.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
jobs:
1313
- kolla-ansible-centos8s-source
1414
- kolla-ansible-debian-source
15+
- kolla-ansible-rocky8-source
1516
- kolla-ansible-ubuntu-source
1617
- kolla-ansible-centos8s-source-kvm
1718
- kolla-ansible-ubuntu-source-kvm

0 commit comments

Comments
 (0)