From 6197903bd42478987516bc4cc3f0769488a37065 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 14 Jul 2022 20:27:59 +0200 Subject: Adding upstream version 2.0. Signed-off-by: Daniel Baumann --- .../dracut-conf/70-nvmf-autoconnect.conf.in | 2 +- .../systemd/nvmefc-boot-connections.service | 10 ---------- .../systemd/nvmefc-boot-connections.service.in | 10 ++++++++++ nvmf-autoconnect/systemd/nvmf-autoconnect.service | 13 ------------- nvmf-autoconnect/systemd/nvmf-autoconnect.service.in | 13 +++++++++++++ nvmf-autoconnect/systemd/nvmf-connect.target | 2 -- nvmf-autoconnect/systemd/nvmf-connect.target.in | 2 ++ nvmf-autoconnect/systemd/nvmf-connect@.service | 14 -------------- nvmf-autoconnect/systemd/nvmf-connect@.service.in | 14 ++++++++++++++ nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules | 19 ------------------- .../udev-rules/70-nvmf-autoconnect.rules.in | 19 +++++++++++++++++++ .../udev-rules/71-nvmf-iopolicy-netapp.rules | 3 --- .../udev-rules/71-nvmf-iopolicy-netapp.rules.in | 3 +++ 13 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 nvmf-autoconnect/systemd/nvmefc-boot-connections.service create mode 100644 nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in delete mode 100644 nvmf-autoconnect/systemd/nvmf-autoconnect.service create mode 100644 nvmf-autoconnect/systemd/nvmf-autoconnect.service.in delete mode 100644 nvmf-autoconnect/systemd/nvmf-connect.target create mode 100644 nvmf-autoconnect/systemd/nvmf-connect.target.in delete mode 100644 nvmf-autoconnect/systemd/nvmf-connect@.service create mode 100644 nvmf-autoconnect/systemd/nvmf-connect@.service.in delete mode 100644 nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules create mode 100644 nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules.in delete mode 100644 nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules create mode 100644 nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules.in (limited to 'nvmf-autoconnect') diff --git a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in index b32f2c3..ba96116 100644 --- a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in +++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in @@ -1 +1 @@ -install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules " +install_items+=" @UDEVRULESDIR@/70-nvmf-autoconnect.rules " diff --git a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service deleted file mode 100644 index 33ab8c1..0000000 --- a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Auto-connect to subsystems on FC-NVME devices found during boot -ConditionPathExists=/sys/class/fc/fc_udev_device/nvme_discovery - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "echo add > /sys/class/fc/fc_udev_device/nvme_discovery" - -[Install] -WantedBy=default.target diff --git a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in new file mode 100644 index 0000000..33ab8c1 --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service.in @@ -0,0 +1,10 @@ +[Unit] +Description=Auto-connect to subsystems on FC-NVME devices found during boot +ConditionPathExists=/sys/class/fc/fc_udev_device/nvme_discovery + +[Service] +Type=oneshot +ExecStart=/bin/sh -c "echo add > /sys/class/fc/fc_udev_device/nvme_discovery" + +[Install] +WantedBy=default.target diff --git a/nvmf-autoconnect/systemd/nvmf-autoconnect.service b/nvmf-autoconnect/systemd/nvmf-autoconnect.service deleted file mode 100644 index b1be272..0000000 --- a/nvmf-autoconnect/systemd/nvmf-autoconnect.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Connect NVMe-oF subsystems automatically during boot -ConditionPathExists=/etc/nvme/discovery.conf -After=network-online.target -Before=remote-fs-pre.target - -[Service] -Type=oneshot -ExecStartPre=/sbin/modprobe nvme-fabrics -ExecStart=/usr/sbin/nvme connect-all - -[Install] -WantedBy=default.target diff --git a/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in b/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in new file mode 100644 index 0000000..d83d9a1 --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmf-autoconnect.service.in @@ -0,0 +1,13 @@ +[Unit] +Description=Connect NVMe-oF subsystems automatically during boot +ConditionPathExists=@SYSCONFDIR@/nvme/discovery.conf +After=network-online.target +Before=remote-fs-pre.target + +[Service] +Type=oneshot +ExecStartPre=/sbin/modprobe nvme-fabrics +ExecStart=@SBINDIR@/nvme connect-all + +[Install] +WantedBy=default.target diff --git a/nvmf-autoconnect/systemd/nvmf-connect.target b/nvmf-autoconnect/systemd/nvmf-connect.target deleted file mode 100644 index f64a37c..0000000 --- a/nvmf-autoconnect/systemd/nvmf-connect.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=All instances of nvmf-autoconnect daemon diff --git a/nvmf-autoconnect/systemd/nvmf-connect.target.in b/nvmf-autoconnect/systemd/nvmf-connect.target.in new file mode 100644 index 0000000..f64a37c --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmf-connect.target.in @@ -0,0 +1,2 @@ +[Unit] +Description=All instances of nvmf-autoconnect daemon diff --git a/nvmf-autoconnect/systemd/nvmf-connect@.service b/nvmf-autoconnect/systemd/nvmf-connect@.service deleted file mode 100644 index 5fbf081..0000000 --- a/nvmf-autoconnect/systemd/nvmf-connect@.service +++ /dev/null @@ -1,14 +0,0 @@ -# -# Unit file used by 70-nvmf-autoconnect.rules. -# - -[Unit] -Description=NVMf auto-connect scan upon nvme discovery controller Events -After=syslog.target -PartOf=nvmf-connect.target -Requires=nvmf-connect.target - -[Service] -Type=simple -Environment="CONNECT_ARGS=%i" -ExecStart=/bin/sh -c "nvme connect-all --matching --quiet `/bin/echo -e '${CONNECT_ARGS}'`" diff --git a/nvmf-autoconnect/systemd/nvmf-connect@.service.in b/nvmf-autoconnect/systemd/nvmf-connect@.service.in new file mode 100644 index 0000000..90f774c --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmf-connect@.service.in @@ -0,0 +1,14 @@ +# +# Unit file used by 70-nvmf-autoconnect.rules. +# + +[Unit] +Description=NVMf auto-connect scan upon nvme discovery controller Events +After=syslog.target +PartOf=nvmf-connect.target +Requires=nvmf-connect.target + +[Service] +Type=simple +Environment="CONNECT_ARGS=%i" +ExecStart=/bin/sh -c "@SBINDIR@/nvme connect-all --quiet `/bin/echo -e '${CONNECT_ARGS}'`" diff --git a/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules b/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules deleted file mode 100644 index cbbebc5..0000000 --- a/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules +++ /dev/null @@ -1,19 +0,0 @@ -# -# nvmf-autoconnect.rules: -# Handles udev events which invoke automatically scan via discovery -# controller and connect to elements in the discovery log. -# -# - -# Events from persistent discovery controllers or nvme-fc transport events -# NVME_AEN: -# type 0x2 (NOTICE) info 0xf0 (DISCOVERY_LOG_CHANGE) log-page-id 0x70 (DISCOVERY_LOG_PAGE) -ACTION=="change", SUBSYSTEM=="nvme", ENV{NVME_AEN}=="0x70f002",\ - ENV{NVME_TRTYPE}=="*", ENV{NVME_TRADDR}=="*", \ - ENV{NVME_TRSVCID}=="*", ENV{NVME_HOST_TRADDR}=="*", \ - RUN+="/bin/systemctl --no-block start nvmf-connect@--device=$kernel\t--transport=$env{NVME_TRTYPE}\t--traddr=$env{NVME_TRADDR}\t--trsvcid=$env{NVME_TRSVCID}\t--host-traddr=$env{NVME_HOST_TRADDR}.service" - -# nvme-fc transport generated events (old-style for compatibility) -ACTION=="change", SUBSYSTEM=="fc", ENV{FC_EVENT}=="nvmediscovery", \ - ENV{NVMEFC_HOST_TRADDR}=="*", ENV{NVMEFC_TRADDR}=="*", \ - RUN+="/bin/systemctl --no-block start nvmf-connect@--device=none\t--transport=fc\t--traddr=$env{NVMEFC_TRADDR}\t--trsvcid=none\t--host-traddr=$env{NVMEFC_HOST_TRADDR}.service" diff --git a/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules.in b/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules.in new file mode 100644 index 0000000..434cc08 --- /dev/null +++ b/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules.in @@ -0,0 +1,19 @@ +# +# nvmf-autoconnect.rules: +# Handles udev events which invoke automatically scan via discovery +# controller and connect to elements in the discovery log. +# +# + +# Events from persistent discovery controllers or nvme-fc transport events +# NVME_AEN: +# type 0x2 (NOTICE) info 0xf0 (DISCOVERY_LOG_CHANGE) log-page-id 0x70 (DISCOVERY_LOG_PAGE) +ACTION=="change", SUBSYSTEM=="nvme", ENV{NVME_AEN}=="0x70f002",\ + ENV{NVME_TRTYPE}=="*", ENV{NVME_TRADDR}=="*", \ + ENV{NVME_TRSVCID}=="*", ENV{NVME_HOST_TRADDR}=="*", \ + RUN+="@SYSTEMCTL@ --no-block start nvmf-connect@--device=$kernel\t--transport=$env{NVME_TRTYPE}\t--traddr=$env{NVME_TRADDR}\t--trsvcid=$env{NVME_TRSVCID}\t--host-traddr=$env{NVME_HOST_TRADDR}.service" + +# nvme-fc transport generated events (old-style for compatibility) +ACTION=="change", SUBSYSTEM=="fc", ENV{FC_EVENT}=="nvmediscovery", \ + ENV{NVMEFC_HOST_TRADDR}=="*", ENV{NVMEFC_TRADDR}=="*", \ + RUN+="@SYSTEMCTL@ --no-block start nvmf-connect@--device=none\t--transport=fc\t--traddr=$env{NVMEFC_TRADDR}\t--trsvcid=none\t--host-traddr=$env{NVMEFC_HOST_TRADDR}.service" diff --git a/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules b/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules deleted file mode 100644 index aefd9d4..0000000 --- a/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules +++ /dev/null @@ -1,3 +0,0 @@ -# Enable round-robin for NetApp ONTAP and NetApp E-Series -ACTION=="add", SUBSYSTEM=="nvme-subsystem", ATTR{model}=="NetApp ONTAP Controller", ATTR{iopolicy}="round-robin" -ACTION=="add", SUBSYSTEM=="nvme-subsystem", ATTR{model}=="NetApp E-Series", ATTR{iopolicy}="round-robin" diff --git a/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules.in b/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules.in new file mode 100644 index 0000000..aefd9d4 --- /dev/null +++ b/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules.in @@ -0,0 +1,3 @@ +# Enable round-robin for NetApp ONTAP and NetApp E-Series +ACTION=="add", SUBSYSTEM=="nvme-subsystem", ATTR{model}=="NetApp ONTAP Controller", ATTR{iopolicy}="round-robin" +ACTION=="add", SUBSYSTEM=="nvme-subsystem", ATTR{model}=="NetApp E-Series", ATTR{iopolicy}="round-robin" -- cgit v1.2.3