From: Chuck Lever <cel@kernel.org>
To: kdevops@lists.linux.dev
Cc: Michael Christie <michael.christie@oracle.com>,
Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH RFC 6/6] gitr: Enable testing with pNFS block layouts
Date: Wed, 15 May 2024 16:49:39 -0400 [thread overview]
Message-ID: <171580617957.111411.3423204097297601088.stgit@oracle-102.chuck.lever.oracle.com.nfsv4.dev> (raw)
In-Reply-To: <171580595774.111411.12296721249184382497.stgit@oracle-102.chuck.lever.oracle.com.nfsv4.dev>
From: Chuck Lever <chuck.lever@oracle.com>
When this new Kconfig option is enabled, an iSCSI initiator is
provisioned on NFS clients so that NFSv4.1+ mounts can use pNFS.
Cc: Michael Christie <michael.christie@oracle.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
playbooks/roles/gitr/defaults/main.yml | 1 +
playbooks/roles/gitr/tasks/main.yml | 7 +++++++
workflows/gitr/nfs/Kconfig | 7 +++++++
workflows/gitr/nfs/Makefile | 3 +++
4 files changed, 18 insertions(+)
diff --git a/playbooks/roles/gitr/defaults/main.yml b/playbooks/roles/gitr/defaults/main.yml
index 44a164048713..7f53ff0eed38 100644
--- a/playbooks/roles/gitr/defaults/main.yml
+++ b/playbooks/roles/gitr/defaults/main.yml
@@ -12,3 +12,4 @@ gitr_uses_no_devices: False
# NFS-specific defaults
gitr_nfs_use_kdevops_nfsd: false
+gitr_nfs_pnfs_block_enable: false
diff --git a/playbooks/roles/gitr/tasks/main.yml b/playbooks/roles/gitr/tasks/main.yml
index 4862ab52c276..883c747c14f7 100644
--- a/playbooks/roles/gitr/tasks/main.yml
+++ b/playbooks/roles/gitr/tasks/main.yml
@@ -51,6 +51,13 @@
name: "{{ gitr_packages }}"
state: present
+- name: Set up an iSCSI initiator on the target node
+ ansible.builtin.include_role:
+ name: iscsi
+ tasks_from: add_initiator
+ when:
+ - gitr_nfs_pnfs_block_enable|bool
+
- name: Remove the old test file system
tags: gitr
become: true
diff --git a/workflows/gitr/nfs/Kconfig b/workflows/gitr/nfs/Kconfig
index 59448c978df3..f8885d833798 100644
--- a/workflows/gitr/nfs/Kconfig
+++ b/workflows/gitr/nfs/Kconfig
@@ -30,6 +30,13 @@ config GITR_NFS_MOUNT_OPTS
The mount options to use when mounting the file system
under test.
+config GITR_NFS_PNFS_BLOCK_ENABLE
+ bool "Run tests with pNFS block"
+ default n
+ help
+ Select this option to install dependencies needed to use
+ pNFS block layouts when testing.
+
if KDEVOPS_WORKFLOW_DEDICATE_GITR
config GITR_NFS_SECTION_V42
diff --git a/workflows/gitr/nfs/Makefile b/workflows/gitr/nfs/Makefile
index 31da5e6d9d9c..a33b547ed1c2 100644
--- a/workflows/gitr/nfs/Makefile
+++ b/workflows/gitr/nfs/Makefile
@@ -12,6 +12,9 @@ GITR_ARGS += gitr_nfs_use_kdevops_nfsd='False'
endif # CONFIG_GITR_USE_KDEVOPS_NFSD
GITR_ARGS += gitr_mount_opts='$(subst ",,$(CONFIG_GITR_NFS_MOUNT_OPTS))'
+ifeq (y,$(CONFIG_GITR_NFS_PNFS_BLOCK_ENABLE))
+GITR_ARGS += gitr_nfs_pnfs_block_enable='True'
+endif
ifeq (y,$(CONFIG_GITR_NFS_SECTION_V42))
GITR_ENABLED_TEST_GROUPS += nfs-v42
prev parent reply other threads:[~2024-05-15 20:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-15 20:49 [PATCH RFC 0/6] Introduce iSCSI target for kdevops Chuck Lever
2024-05-15 20:49 ` [PATCH RFC 1/6] nfsd_add_export: Move storage allocation to separate YML files Chuck Lever
2024-05-15 20:49 ` [PATCH RFC 2/6] Shorten the names of devices where exports reside Chuck Lever
2024-05-15 20:49 ` [PATCH RFC 3/6] iscsi: Provision a target node to host iSCSI LUNs Chuck Lever
2024-05-15 20:49 ` [PATCH RFC 4/6] nfsd: Provision an iSCSI initiator on the kdevops NFS server Chuck Lever
2024-05-15 20:49 ` [PATCH RFC 5/6] nfsd_add_export: Enable pnfs on capable exports Chuck Lever
2024-05-15 20:49 ` Chuck Lever [this message]
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=171580617957.111411.3423204097297601088.stgit@oracle-102.chuck.lever.oracle.com.nfsv4.dev \
--to=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=kdevops@lists.linux.dev \
--cc=michael.christie@oracle.com \
/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).