From: Jeff Layton <jlayton@kernel.org>
To: kdevops@lists.linux.dev
Cc: Jeff Layton <jlayton@kernel.org>
Subject: [PATCH 7/8] redhat: fix up some install-deps cases for CentOS
Date: Wed, 20 Mar 2024 09:11:30 -0400 [thread overview]
Message-ID: <20240320-fixes-v1-7-d1567776ad50@kernel.org> (raw)
In-Reply-To: <20240320-fixes-v1-0-d1567776ad50@kernel.org>
Fix up some "when" cases for install-deps in ktls and pynfs.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
playbooks/roles/ktls/tasks/install-deps/redhat/main.yml | 2 +-
playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml b/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml
index 5d6a18c9d6c3..802ef2a4c3ed 100644
--- a/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml
+++ b/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml
@@ -9,7 +9,7 @@
set_fact:
epel_package:
- epel-release
- when: ansible_distribution == 'OracleLinux'
+ when: ansible_distribution == 'OracleLinux' or ansible_distribution == 'CentOS'
- name: Install epel-release
become: yes
diff --git a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
index 9a133c0da661..be5ded1da8df 100644
--- a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
+++ b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
@@ -3,8 +3,7 @@
become: yes
command: /usr/bin/dnf config-manager --enable codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}-rpms
when:
- - rhel_org_id is defined
- - rhel_activation_key is defined
+ - ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
- name: Install build dependencies for pynfs
become: yes
--
2.44.0
next prev parent reply other threads:[~2024-03-20 13:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-20 13:11 [PATCH 0/8] kdevops: random fixes Jeff Layton
2024-03-20 13:11 ` [PATCH 1/8] fstests: remove the nfs_default guest Jeff Layton
2024-03-20 13:11 ` [PATCH 2/8] fstests: add an option for testing nfs over rdma Jeff Layton
2024-03-20 13:11 ` [PATCH 3/8] fstests: enable the "codeready" repo on RHEL and CentOS Jeff Layton
2024-03-20 13:11 ` [PATCH 4/8] kotd: display the running kernel version after updating Jeff Layton
2024-03-20 13:11 ` [PATCH 5/8] devconfig: run it on nfsd in addition to the all group Jeff Layton
2024-03-20 13:11 ` [PATCH 6/8] devconfig: don't install dump on redhat family hosts Jeff Layton
2024-03-20 13:11 ` Jeff Layton [this message]
2024-03-20 13:11 ` [PATCH 8/8] nfsd: default to a more sane number of threads Jeff Layton
2024-03-20 14:10 ` Chuck Lever
2024-03-20 14:48 ` Jeff Layton
2024-03-20 15:15 ` Chuck Lever
2024-03-20 16:56 ` Jeff Layton
2024-03-20 14:11 ` [PATCH 0/8] kdevops: random fixes Chuck Lever
2024-03-20 14:29 ` Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240320-fixes-v1-7-d1567776ad50@kernel.org \
--to=jlayton@kernel.org \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).