Browse Source

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>
Scott Little 8 months ago
parent
commit
51f969296b

+ 0
- 1
centos_pkg_dirs View File

@@ -1,5 +1,4 @@
1 1
 iptables
2
-iscsi-initiator-utils
3 2
 ldapscripts
4 3
 net-tools
5 4
 drbd-tools

+ 0
- 17
iscsi-initiator-utils/PKG-INFO View File

@@ -1,17 +0,0 @@
1
-Metadata-Version: 1.1
2
-Name: iscsi-initiator-utils
3
-Version: 2.0-873
4
-Summary: iSCSI daemon and utility programs
5
-Home-page: 
6
-Author:
7
-Author-email:
8
-License: GPLv2+
9
-
10
-Description:
11
-The iscsi package provides the server daemon for the iSCSI protocol,
12
-as well as the utility programs used to manage it. iSCSI is a protocol
13
-for distributed disk access using SCSI commands sent over Internet
14
-Protocol networks.
15
-
16
-        
17
-Platform: UNKNOWN

+ 0
- 2
iscsi-initiator-utils/centos/build_srpm.data View File

@@ -1,2 +0,0 @@
1
-COPY_LIST="files/*"
2
-TIS_PATCH_VER=2

+ 0
- 87
iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch View File

@@ -1,88 +0,0 @@
1
-From 70c42ca7d05032305e77b7ea10d003cac0b932ef Mon Sep 17 00:00:00 2001
2
-From: Scott Little <scott.little@windriver.com>
3
-Date: Mon, 2 Oct 2017 16:19:19 -0400
4
-Subject: [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
-
10
-diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
11
-index 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
-1.9.1
87
-

+ 0
- 26
iscsi-initiator-utils/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch View File

@@ -1,27 +0,0 @@
1
-From 85c339bab120a0ca76e97af0ec3c48ad0448b066 Mon Sep 17 00:00:00 2001
2
-From: Scott Little <scott.little@windriver.com>
3
-Date: Mon, 2 Oct 2017 16:19:19 -0400
4
-Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
5
-
6
-Conflicts:
7
-	SPECS/iscsi-initiator-utils.spec
8
----
9
- SPECS/iscsi-initiator-utils.spec | 2 +-
10
- 1 file changed, 1 insertion(+), 1 deletion(-)
11
-
12
-diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
13
-index 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
-1.9.1
26
-

+ 0
- 25
iscsi-initiator-utils/centos/meta_patches/0003-Add-iscsi-shutdown.service-patch.patch View File

@@ -1,26 +0,0 @@
1
-From a6f22ef69ec794098fdd639f15a8266949de1499 Mon Sep 17 00:00:00 2001
2
-From: Don Penney <don.penney@windriver.com>
3
-Date: Thu, 2 Nov 2017 11:03:43 -0400
4
-Subject: [PATCH] Add iscsi-shutdown.service patch
5
-
6
----
7
- SPECS/iscsi-initiator-utils.spec | 3 ++-
8
- 1 file changed, 2 insertions(+), 1 deletion(-)
9
-
10
-diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
11
-index 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
-1.8.3.1
25
-

+ 0
- 3
iscsi-initiator-utils/centos/meta_patches/PATCH_ORDER View File

@@ -1,3 +0,0 @@
1
-0001-spec-include-TiS-changes.patch
2
-0002-Update-package-versioning-for-TIS-format.patch
3
-0003-Add-iscsi-shutdown.service-patch.patch

+ 0
- 47
iscsi-initiator-utils/centos/patches/0001-increase-default-error-timeouts-for-iSCSI-initiator.patch View File

@@ -1,48 +0,0 @@
1
-From e030a19da5a93a8fdca9ed1c7263d6e2be3ceb5a Mon Sep 17 00:00:00 2001
2
-From: Chris Friesen <chris.friesen@windriver.com>
3
-Date: Wed, 5 Aug 2015 18:09:36 -0400
4
-Subject: [PATCH] Increase default error timeouts for iSCSI initiator
5
-
6
-The only place we use the iSCSI initiator within our system is on
7
-the compute nodes when using cinder volumes.
8
-
9
-Accordingly, change the default values to something that makes more
10
-sense when instance root filesystems are being accessed via iSCSI.
11
-
12
-This addresses CGTS-2286.
13
----
14
- etc/iscsid.conf | 6 +++---
15
- 1 file changed, 3 insertions(+), 3 deletions(-)
16
-
17
-diff --git a/etc/iscsid.conf b/etc/iscsid.conf
18
-index 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
-1.9.1
47
-

+ 0
- 24
iscsi-initiator-utils/centos/patches/0002-Add-dependency-against-network.service-to-iscsi-shut.patch View File

@@ -1,25 +0,0 @@
1
-From f1f45f8028b8ef5804e0c9ff4d7dd5be6d21fdb4 Mon Sep 17 00:00:00 2001
2
-From: Don Penney <don.penney@windriver.com>
3
-Date: Thu, 2 Nov 2017 11:00:17 -0400
4
-Subject: [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
-
11
-diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
12
-index 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
-1.8.3.1
24
-

+ 0
- 1
iscsi-initiator-utils/centos/srpm_path View File

@@ -1 +0,0 @@
1
-mirror:Source/iscsi-initiator-utils-6.2.0.874-4.el7.src.rpm

+ 0
- 3
iscsi-initiator-utils/files/iscsi-cache.volatiles View File

@@ -1,3 +0,0 @@
1
-# See "man tmpfiles.d" for details
2
-d /run/iscsi-cache 0755 root root -
3
-L /var/lib/iscsi - - - - /run/iscsi-cache

Loading…
Cancel
Save