Skip to content

Commit

Permalink
Add RockyLinux support
Browse files Browse the repository at this point in the history
Fixes: #241

Signed-off-by: Teoman ONAY <tonay@ibm.com>
  • Loading branch information
asm0deuz committed Dec 4, 2023
1 parent 90e8370 commit e47fc95
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cephadm-clients.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
changed_when: false
register: result
until: result is succeeded
when: ansible_facts['distribution'] == 'CentOS' or ansible_facts['distribution'] == 'RedHat'
when: ansible_facts['os_family'] == 'RedHat'

- name: install ceph client prerequisites if needed
package:
Expand Down
4 changes: 2 additions & 2 deletions cephadm-preflight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
name: ceph_defaults

- name: redhat family of OS related tasks
when: ansible_facts['distribution'] == 'CentOS' or ansible_facts['distribution'] == 'RedHat'
when: ansible_facts['os_family'] == 'RedHat'
block:
- name: rhcs related tasks
when: ceph_origin == 'rhcs'
Expand Down Expand Up @@ -163,7 +163,7 @@
loop: "{{ ceph_custom_repositories }}"

- name: install epel-release
when: ansible_facts['distribution'] == 'CentOS'
when: ansible_facts['distribution'] != 'RedHat'
block:
- name: enable required CentOS repository for epel
command: dnf config-manager --set-enabled "{{ 'powertools' if ansible_facts['distribution_major_version'] == '8' else 'crb' }}"
Expand Down
7 changes: 5 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
flake8,mypy,unittests
{el8,el9}-{functional}
{el8,el9,rocky8,rocky9,ubuntu_lts}-{functional}
skipsdist = True

[testenv:mypy]
Expand All @@ -27,7 +27,7 @@ setenv=
PYTHONPATH = {env:PYTHONPATH:}:{toxinidir}/library:{toxinidir}/module_utils:{toxinidir}/tests/library
commands = py.test -vvv -n=auto {toxinidir}/tests/library/ {toxinidir}/tests/module_utils

[testenv:{el8,el9}-functional]
[testenv:{el8,el9,rocky8,rocky9,ubuntu_lts}-functional]
allowlist_externals =
vagrant
bash
Expand All @@ -38,6 +38,9 @@ setenv=
# Set the vagrant box image to use
el8: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
el9: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream9
rocky8: CEPH_ANSIBLE_VAGRANT_BOX = generic/rocky8
rocky9: CEPH_ANSIBLE_VAGRANT_BOX = generic/rocky9
ubuntu_lts: CEPH_ANSIBLE_VAGRANT_BOX = generic/ubuntu2204
ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey
ANSIBLE_CONFIG = {toxinidir}/ansible.cfg
ANSIBLE_CALLBACK_WHITELIST = profile_tasks
Expand Down

0 comments on commit e47fc95

Please sign in to comment.