summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Little <scott.little@windriver.com>2018-08-01 14:22:15 -0400
committerScott Little <scott.little@windriver.com>2018-08-01 14:22:17 -0400
commit51f969296b3d7a2dc4277d57f4f97a563b8c0550 (patch)
treeea8cbd406ce5561b9559abeec3c158012b132e6c
parent20d60b6be8c13ed80f59f8813c9705ef64758ddb (diff)
Relocate iscsi-initiator-utils to
stx-integ/filesystem/iscsi-initiator-utils Move content from stx-gplv2 into stx-integ Packages will be relocated to stx-integ: base/ bash cgcs-users cluster-resource-agents dpkg haproxy libfdt netpbm rpm database/ mariadb filesystem/ iscsi-initiator-utils filesystem/drbd/ drbd-tools kernel/kernel-modules/ drbd integrity intel-e1000e intel-i40e intel-i40evf intel-ixgbe intel-ixgbevf qat17 tpmdd ldap/ ldapscripts networking/ iptables net-tools Change-Id: I3c9dee47748f7feb32e00c7110f385a0b4d80763 Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
Notes
Notes (review): Code-Review+2: Don Penney <don.penney@windriver.com> Code-Review+2: Saul Wold <sgw@linux.intel.com> Workflow+1: Scott Little <scott.little@windriver.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 02 Aug 2018 19:11:45 +0000 Reviewed-on: https://review.openstack.org/587964 Project: openstack/stx-gplv2 Branch: refs/heads/master
-rw-r--r--centos_pkg_dirs1
-rw-r--r--iscsi-initiator-utils/PKG-INFO17
-rw-r--r--iscsi-initiator-utils/centos/build_srpm.data2
-rw-r--r--iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch88
-rw-r--r--iscsi-initiator-utils/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch27
-rw-r--r--iscsi-initiator-utils/centos/meta_patches/0003-Add-iscsi-shutdown.service-patch.patch26
-rw-r--r--iscsi-initiator-utils/centos/meta_patches/PATCH_ORDER3
-rw-r--r--iscsi-initiator-utils/centos/patches/0001-increase-default-error-timeouts-for-iSCSI-initiator.patch48
-rw-r--r--iscsi-initiator-utils/centos/patches/0002-Add-dependency-against-network.service-to-iscsi-shut.patch25
-rw-r--r--iscsi-initiator-utils/centos/srpm_path1
-rw-r--r--iscsi-initiator-utils/files/iscsi-cache.volatiles3
11 files changed, 0 insertions, 241 deletions
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index 32ec8a8..d04671c 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,5 +1,4 @@
1iptables 1iptables
2iscsi-initiator-utils
3ldapscripts 2ldapscripts
4net-tools 3net-tools
5drbd-tools 4drbd-tools
diff --git a/iscsi-initiator-utils/PKG-INFO b/iscsi-initiator-utils/PKG-INFO
deleted file mode 100644
index 1336d62..0000000
--- a/iscsi-initiator-utils/PKG-INFO
+++ /dev/null
@@ -1,17 +0,0 @@
1Metadata-Version: 1.1
2Name: iscsi-initiator-utils
3Version: 2.0-873
4Summary: iSCSI daemon and utility programs
5Home-page:
6Author:
7Author-email:
8License: GPLv2+
9
10Description:
11The iscsi package provides the server daemon for the iSCSI protocol,
12as well as the utility programs used to manage it. iSCSI is a protocol
13for distributed disk access using SCSI commands sent over Internet
14Protocol networks.
15
16
17Platform: UNKNOWN
diff --git a/iscsi-initiator-utils/centos/build_srpm.data b/iscsi-initiator-utils/centos/build_srpm.data
deleted file mode 100644
index 112ca54..0000000
--- a/iscsi-initiator-utils/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
1COPY_LIST="files/*"
2TIS_PATCH_VER=2
diff --git a/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch b/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch
deleted file mode 100644
index 4979dd2..0000000
--- a/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch
+++ /dev/null
@@ -1,88 +0,0 @@
1From 70c42ca7d05032305e77b7ea10d003cac0b932ef Mon Sep 17 00:00:00 2001
2From: Scott Little <scott.little@windriver.com>
3Date: Mon, 2 Oct 2017 16:19:19 -0400
4Subject: [PATCH 1/2] WRS: spec-include-TiS-changes.patch
5
6---
7 SPECS/iscsi-initiator-utils.spec | 30 +++++++++++++++++++++---------
8 1 file changed, 21 insertions(+), 9 deletions(-)
9
10diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
11index e164c03..ce2198d 100644
12--- a/SPECS/iscsi-initiator-utils.spec
13+++ b/SPECS/iscsi-initiator-utils.spec
14@@ -13,6 +13,9 @@ Source0: https://github.com/open-iscsi/open-iscsi/archive/%{open_iscsi_version}.
15 Source4: 04-iscsi
16 Source5: iscsi-tmpfiles.conf
17
18+# WRS
19+Source6: iscsi-cache.volatiles
20+
21 # upstream patches, post last tagged version
22 Patch1: open-iscsi-2.0.874-1-iBFT-origin-is-an-enum-not-a-string.patch
23 Patch2: open-iscsi-2.0.874-4-iscsid-treat-SIGTERM-like-iscsiadm-k-0.patch
24@@ -54,6 +57,9 @@ Patch198: keep-open-isns.patch
25 # version string, needs to be updated with each build
26 Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
27
28+# WRS
29+Patch200: increase-default-error-timeouts-for-iSCSI-initiator.patch
30+
31 BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel libmount-devel autoconf automake libtool
32 # For dir ownership
33 Requires: %{name}-iscsiuio >= %{version}-%{release}
34@@ -167,6 +173,9 @@ touch $RPM_BUILD_ROOT/var/lock/iscsi/lock
35 %{__install} -pm 755 libiscsi/build/lib.linux-*/libiscsimodule.so \
36 $RPM_BUILD_ROOT%{python_sitearch}
37
38+# WRS
39+%{__install} -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_tmpfilesdir}/iscsi-cache.conf
40+
41
42 %post
43 /sbin/ldconfig
44@@ -229,13 +238,13 @@ fi
45
46 %files
47 %doc README
48-%dir %{_sharedstatedir}/iscsi
49-%dir %{_sharedstatedir}/iscsi/nodes
50-%dir %{_sharedstatedir}/iscsi/isns
51-%dir %{_sharedstatedir}/iscsi/static
52-%dir %{_sharedstatedir}/iscsi/slp
53-%dir %{_sharedstatedir}/iscsi/ifaces
54-%dir %{_sharedstatedir}/iscsi/send_targets
55+%ghost %{_sharedstatedir}/iscsi
56+%ghost %{_sharedstatedir}/iscsi/nodes
57+%ghost %{_sharedstatedir}/iscsi/isns
58+%ghost %{_sharedstatedir}/iscsi/static
59+%ghost %{_sharedstatedir}/iscsi/slp
60+%ghost %{_sharedstatedir}/iscsi/ifaces
61+%ghost %{_sharedstatedir}/iscsi/send_targets
62 %ghost %{_var}/lock/iscsi
63 %ghost %{_var}/lock/iscsi/lock
64 %{_unitdir}/iscsi.service
65@@ -245,8 +254,8 @@ fi
66 %{_libexecdir}/iscsi-mark-root-nodes
67 %{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi
68 %{_tmpfilesdir}/iscsi.conf
69-%dir %{_sysconfdir}/iscsi
70-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
71+%attr(0750,root,root) %dir %{_sysconfdir}/iscsi
72+%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
73 %{_sbindir}/iscsi-iname
74 %{_sbindir}/iscsiadm
75 %{_sbindir}/iscsid
76@@ -258,6 +267,9 @@ fi
77 %{_mandir}/man8/iscsid.8.gz
78 %{_mandir}/man8/iscsistart.8.gz
79
80+# WRS
81+%{_tmpfilesdir}/iscsi-cache.conf
82+
83 %files iscsiuio
84 %{_sbindir}/iscsiuio
85 %{_unitdir}/iscsiuio.service
86--
871.9.1
88
diff --git a/iscsi-initiator-utils/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch b/iscsi-initiator-utils/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch
deleted file mode 100644
index 28bdf0b..0000000
--- a/iscsi-initiator-utils/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 85c339bab120a0ca76e97af0ec3c48ad0448b066 Mon Sep 17 00:00:00 2001
2From: Scott Little <scott.little@windriver.com>
3Date: Mon, 2 Oct 2017 16:19:19 -0400
4Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
5
6Conflicts:
7 SPECS/iscsi-initiator-utils.spec
8---
9 SPECS/iscsi-initiator-utils.spec | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
13index ce2198d..e9402cb 100644
14--- a/SPECS/iscsi-initiator-utils.spec
15+++ b/SPECS/iscsi-initiator-utils.spec
16@@ -4,7 +4,7 @@
17 Summary: iSCSI daemon and utility programs
18 Name: iscsi-initiator-utils
19 Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
20-Release: 4%{?dist}
21+Release: 4.el7%{?_tis_dist}.%{tis_patch_ver}
22 Group: System Environment/Daemons
23 License: GPLv2+
24 URL: http://www.open-iscsi.org
25--
261.9.1
27
diff --git a/iscsi-initiator-utils/centos/meta_patches/0003-Add-iscsi-shutdown.service-patch.patch b/iscsi-initiator-utils/centos/meta_patches/0003-Add-iscsi-shutdown.service-patch.patch
deleted file mode 100644
index f7c2835..0000000
--- a/iscsi-initiator-utils/centos/meta_patches/0003-Add-iscsi-shutdown.service-patch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From a6f22ef69ec794098fdd639f15a8266949de1499 Mon Sep 17 00:00:00 2001
2From: Don Penney <don.penney@windriver.com>
3Date: Thu, 2 Nov 2017 11:03:43 -0400
4Subject: [PATCH] Add iscsi-shutdown.service patch
5
6---
7 SPECS/iscsi-initiator-utils.spec | 3 ++-
8 1 file changed, 2 insertions(+), 1 deletion(-)
9
10diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
11index 1457acb..0a95945 100644
12--- a/SPECS/iscsi-initiator-utils.spec
13+++ b/SPECS/iscsi-initiator-utils.spec
14@@ -57,7 +57,8 @@ Patch198: keep-open-isns.patch
15 Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
16
17 # WRS
18-Patch200: increase-default-error-timeouts-for-iSCSI-initiator.patch
19+Patch10001: 0001-increase-default-error-timeouts-for-iSCSI-initiator.patch
20+Patch10002: 0002-Add-dependency-against-network.service-to-iscsi-shut.patch
21
22 BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel libmount-devel autoconf automake libtool
23 # For dir ownership
24--
251.8.3.1
26
diff --git a/iscsi-initiator-utils/centos/meta_patches/PATCH_ORDER b/iscsi-initiator-utils/centos/meta_patches/PATCH_ORDER
deleted file mode 100644
index 5177e03..0000000
--- a/iscsi-initiator-utils/centos/meta_patches/PATCH_ORDER
+++ /dev/null
@@ -1,3 +0,0 @@
10001-spec-include-TiS-changes.patch
20002-Update-package-versioning-for-TIS-format.patch
30003-Add-iscsi-shutdown.service-patch.patch
diff --git a/iscsi-initiator-utils/centos/patches/0001-increase-default-error-timeouts-for-iSCSI-initiator.patch b/iscsi-initiator-utils/centos/patches/0001-increase-default-error-timeouts-for-iSCSI-initiator.patch
deleted file mode 100644
index a3794ce..0000000
--- a/iscsi-initiator-utils/centos/patches/0001-increase-default-error-timeouts-for-iSCSI-initiator.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From e030a19da5a93a8fdca9ed1c7263d6e2be3ceb5a Mon Sep 17 00:00:00 2001
2From: Chris Friesen <chris.friesen@windriver.com>
3Date: Wed, 5 Aug 2015 18:09:36 -0400
4Subject: [PATCH] Increase default error timeouts for iSCSI initiator
5
6The only place we use the iSCSI initiator within our system is on
7the compute nodes when using cinder volumes.
8
9Accordingly, change the default values to something that makes more
10sense when instance root filesystems are being accessed via iSCSI.
11
12This addresses CGTS-2286.
13---
14 etc/iscsid.conf | 6 +++---
15 1 file changed, 3 insertions(+), 3 deletions(-)
16
17diff --git a/etc/iscsid.conf b/etc/iscsid.conf
18index b9b3b1f..0f270b5 100644
19--- a/etc/iscsid.conf
20+++ b/etc/iscsid.conf
21@@ -95,7 +95,7 @@ node.leading_login = No
22 # - If the value is 0, IO will be failed immediately.
23 # - If the value is less than 0, IO will remain queued until the session
24 # is logged back in, or until the user runs the logout command.
25-node.session.timeo.replacement_timeout = 120
26+node.session.timeo.replacement_timeout = 900
27
28 # To specify the time to wait for login to complete, edit the line.
29 # The value is in seconds and the default is 15 seconds.
30@@ -106,13 +106,13 @@ node.conn[0].timeo.login_timeout = 15
31 node.conn[0].timeo.logout_timeout = 15
32
33 # Time interval to wait for on connection before sending a ping.
34-node.conn[0].timeo.noop_out_interval = 5
35+node.conn[0].timeo.noop_out_interval = 900
36
37 # To specify the time to wait for a Nop-out response before failing
38 # the connection, edit this line. Failing the connection will
39 # cause IO to be failed back to the SCSI layer. If using dm-multipath
40 # this will cause the IO to be failed to the multipath layer.
41-node.conn[0].timeo.noop_out_timeout = 5
42+node.conn[0].timeo.noop_out_timeout = 900
43
44 # To specify the time to wait for abort response before
45 # failing the operation and trying a logical unit reset edit the line.
46--
471.9.1
48
diff --git a/iscsi-initiator-utils/centos/patches/0002-Add-dependency-against-network.service-to-iscsi-shut.patch b/iscsi-initiator-utils/centos/patches/0002-Add-dependency-against-network.service-to-iscsi-shut.patch
deleted file mode 100644
index 28dacdb..0000000
--- a/iscsi-initiator-utils/centos/patches/0002-Add-dependency-against-network.service-to-iscsi-shut.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From f1f45f8028b8ef5804e0c9ff4d7dd5be6d21fdb4 Mon Sep 17 00:00:00 2001
2From: Don Penney <don.penney@windriver.com>
3Date: Thu, 2 Nov 2017 11:00:17 -0400
4Subject: [PATCH] Add dependency against network.service to
5 iscsi-shutdown.service
6
7---
8 etc/systemd/iscsi-shutdown.service | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
12index fcb431a..35ee8ba 100644
13--- a/etc/systemd/iscsi-shutdown.service
14+++ b/etc/systemd/iscsi-shutdown.service
15@@ -4,6 +4,7 @@ Documentation=man:iscsid(8) man:iscsiadm(8)
16 DefaultDependencies=no
17 Conflicts=shutdown.target
18 After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
19+After=network.service
20 Before=remote-fs-pre.target
21 Wants=remote-fs-pre.target
22 RefuseManualStop=yes
23--
241.8.3.1
25
diff --git a/iscsi-initiator-utils/centos/srpm_path b/iscsi-initiator-utils/centos/srpm_path
deleted file mode 100644
index ab53ea1..0000000
--- a/iscsi-initiator-utils/centos/srpm_path
+++ /dev/null
@@ -1 +0,0 @@
1mirror:Source/iscsi-initiator-utils-6.2.0.874-4.el7.src.rpm
diff --git a/iscsi-initiator-utils/files/iscsi-cache.volatiles b/iscsi-initiator-utils/files/iscsi-cache.volatiles
deleted file mode 100644
index 9f26672..0000000
--- a/iscsi-initiator-utils/files/iscsi-cache.volatiles
+++ /dev/null
@@ -1,3 +0,0 @@
1# See "man tmpfiles.d" for details
2d /run/iscsi-cache 0755 root root -
3L /var/lib/iscsi - - - - /run/iscsi-cache