Relocate iscsi-initiator-utils to stx-integ/filesystem/...

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

Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
Change-Id: I33594eeb5112f43ed4264361aaee841503e66276

centos_pkg_dirs

@@ -133,3 +133,4 @@ base/libfdt
 base/bash
 base/haproxy
 base/netpbm
+filesystem/iscsi-initiator-utils

filesystem/iscsi-initiator-utils/PKG-INFO

@@ -0,0 +1,17 @@
+Metadata-Version: 1.1
+Name: iscsi-initiator-utils
+Version: 2.0-873
+Summary: iSCSI daemon and utility programs
+Home-page: 
+Author:
+Author-email:
+License: GPLv2+
+
+Description:
+The iscsi package provides the server daemon for the iSCSI protocol,
+as well as the utility programs used to manage it. iSCSI is a protocol
+for distributed disk access using SCSI commands sent over Internet
+Protocol networks.
+
+        
+Platform: UNKNOWN

filesystem/iscsi-initiator-utils/centos/build_srpm.data

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

filesystem/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch

@@ -0,0 +1,88 @@
+From 70c42ca7d05032305e77b7ea10d003cac0b932ef Mon Sep 17 00:00:00 2001
+From: Scott Little <scott.little@windriver.com>
+Date: Mon, 2 Oct 2017 16:19:19 -0400
+Subject: [PATCH 1/2] WRS: spec-include-TiS-changes.patch
+
+---
+ SPECS/iscsi-initiator-utils.spec | 30 +++++++++++++++++++++---------
+ 1 file changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
+index e164c03..ce2198d 100644
+--- a/SPECS/iscsi-initiator-utils.spec
++++ b/SPECS/iscsi-initiator-utils.spec
+@@ -13,6 +13,9 @@ Source0: https://github.com/open-iscsi/open-iscsi/archive/%{open_iscsi_version}.
+ Source4: 04-iscsi
+ Source5: iscsi-tmpfiles.conf
+ 
++# WRS
++Source6: iscsi-cache.volatiles
++
+ # upstream patches, post last tagged version
+ Patch1: open-iscsi-2.0.874-1-iBFT-origin-is-an-enum-not-a-string.patch
+ Patch2: open-iscsi-2.0.874-4-iscsid-treat-SIGTERM-like-iscsiadm-k-0.patch
+@@ -54,6 +57,9 @@ Patch198: keep-open-isns.patch
+ # version string, needs to be updated with each build
+ Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
+ 
++# WRS
++Patch200: increase-default-error-timeouts-for-iSCSI-initiator.patch
++
+ BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel libmount-devel autoconf automake libtool
+ # For dir ownership
+ Requires: %{name}-iscsiuio >= %{version}-%{release}
+@@ -167,6 +173,9 @@ touch $RPM_BUILD_ROOT/var/lock/iscsi/lock
+ %{__install} -pm 755 libiscsi/build/lib.linux-*/libiscsimodule.so \
+ 	$RPM_BUILD_ROOT%{python_sitearch}
+ 
++# WRS
++%{__install} -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_tmpfilesdir}/iscsi-cache.conf
++
+ 
+ %post
+ /sbin/ldconfig
+@@ -229,13 +238,13 @@ fi
+ 
+ %files
+ %doc README
+-%dir %{_sharedstatedir}/iscsi
+-%dir %{_sharedstatedir}/iscsi/nodes
+-%dir %{_sharedstatedir}/iscsi/isns
+-%dir %{_sharedstatedir}/iscsi/static
+-%dir %{_sharedstatedir}/iscsi/slp
+-%dir %{_sharedstatedir}/iscsi/ifaces
+-%dir %{_sharedstatedir}/iscsi/send_targets
++%ghost %{_sharedstatedir}/iscsi
++%ghost %{_sharedstatedir}/iscsi/nodes
++%ghost %{_sharedstatedir}/iscsi/isns
++%ghost %{_sharedstatedir}/iscsi/static
++%ghost %{_sharedstatedir}/iscsi/slp
++%ghost %{_sharedstatedir}/iscsi/ifaces
++%ghost %{_sharedstatedir}/iscsi/send_targets
+ %ghost %{_var}/lock/iscsi
+ %ghost %{_var}/lock/iscsi/lock
+ %{_unitdir}/iscsi.service
+@@ -245,8 +254,8 @@ fi
+ %{_libexecdir}/iscsi-mark-root-nodes
+ %{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi
+ %{_tmpfilesdir}/iscsi.conf
+-%dir %{_sysconfdir}/iscsi
+-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
++%attr(0750,root,root) %dir %{_sysconfdir}/iscsi
++%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
+ %{_sbindir}/iscsi-iname
+ %{_sbindir}/iscsiadm
+ %{_sbindir}/iscsid
+@@ -258,6 +267,9 @@ fi
+ %{_mandir}/man8/iscsid.8.gz
+ %{_mandir}/man8/iscsistart.8.gz
+ 
++# WRS
++%{_tmpfilesdir}/iscsi-cache.conf
++
+ %files iscsiuio
+ %{_sbindir}/iscsiuio
+ %{_unitdir}/iscsiuio.service
+-- 
+1.9.1
+

filesystem/iscsi-initiator-utils/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch

@@ -0,0 +1,27 @@
+From 85c339bab120a0ca76e97af0ec3c48ad0448b066 Mon Sep 17 00:00:00 2001
+From: Scott Little <scott.little@windriver.com>
+Date: Mon, 2 Oct 2017 16:19:19 -0400
+Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
+
+Conflicts:
+	SPECS/iscsi-initiator-utils.spec
+---
+ SPECS/iscsi-initiator-utils.spec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
+index ce2198d..e9402cb 100644
+--- a/SPECS/iscsi-initiator-utils.spec
++++ b/SPECS/iscsi-initiator-utils.spec
+@@ -4,7 +4,7 @@
+ Summary: iSCSI daemon and utility programs
+ Name: iscsi-initiator-utils
+ Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
+-Release: 4%{?dist}
++Release: 4.el7%{?_tis_dist}.%{tis_patch_ver}
+ Group: System Environment/Daemons
+ License: GPLv2+
+ URL: http://www.open-iscsi.org
+-- 
+1.9.1
+

filesystem/iscsi-initiator-utils/centos/meta_patches/0003-Add-iscsi-shutdown.service-patch.patch

@@ -0,0 +1,26 @@
+From a6f22ef69ec794098fdd639f15a8266949de1499 Mon Sep 17 00:00:00 2001
+From: Don Penney <don.penney@windriver.com>
+Date: Thu, 2 Nov 2017 11:03:43 -0400
+Subject: [PATCH] Add iscsi-shutdown.service patch
+
+---
+ SPECS/iscsi-initiator-utils.spec | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec
+index 1457acb..0a95945 100644
+--- a/SPECS/iscsi-initiator-utils.spec
++++ b/SPECS/iscsi-initiator-utils.spec
+@@ -57,7 +57,8 @@ Patch198: keep-open-isns.patch
+ Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
+ 
+ # WRS
+-Patch200: increase-default-error-timeouts-for-iSCSI-initiator.patch
++Patch10001: 0001-increase-default-error-timeouts-for-iSCSI-initiator.patch
++Patch10002: 0002-Add-dependency-against-network.service-to-iscsi-shut.patch
+ 
+ BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel libmount-devel autoconf automake libtool
+ # For dir ownership
+-- 
+1.8.3.1
+

filesystem/iscsi-initiator-utils/centos/meta_patches/PATCH_ORDER

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

filesystem/iscsi-initiator-utils/centos/patches/0001-increase-default-error-timeouts-for-iSCSI-initiator.patch

@@ -0,0 +1,48 @@
+From e030a19da5a93a8fdca9ed1c7263d6e2be3ceb5a Mon Sep 17 00:00:00 2001
+From: Chris Friesen <chris.friesen@windriver.com>
+Date: Wed, 5 Aug 2015 18:09:36 -0400
+Subject: [PATCH] Increase default error timeouts for iSCSI initiator
+
+The only place we use the iSCSI initiator within our system is on
+the compute nodes when using cinder volumes.
+
+Accordingly, change the default values to something that makes more
+sense when instance root filesystems are being accessed via iSCSI.
+
+This addresses CGTS-2286.
+---
+ etc/iscsid.conf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/etc/iscsid.conf b/etc/iscsid.conf
+index b9b3b1f..0f270b5 100644
+--- a/etc/iscsid.conf
++++ b/etc/iscsid.conf
+@@ -95,7 +95,7 @@ node.leading_login = No
+ # - If the value is 0, IO will be failed immediately.
+ # - If the value is less than 0, IO will remain queued until the session
+ # is logged back in, or until the user runs the logout command.
+-node.session.timeo.replacement_timeout = 120
++node.session.timeo.replacement_timeout = 900 
+ 
+ # To specify the time to wait for login to complete, edit the line.
+ # The value is in seconds and the default is 15 seconds.
+@@ -106,13 +106,13 @@ node.conn[0].timeo.login_timeout = 15
+ node.conn[0].timeo.logout_timeout = 15
+ 
+ # Time interval to wait for on connection before sending a ping.
+-node.conn[0].timeo.noop_out_interval = 5
++node.conn[0].timeo.noop_out_interval = 900 
+ 
+ # To specify the time to wait for a Nop-out response before failing
+ # the connection, edit this line. Failing the connection will
+ # cause IO to be failed back to the SCSI layer. If using dm-multipath
+ # this will cause the IO to be failed to the multipath layer.
+-node.conn[0].timeo.noop_out_timeout = 5
++node.conn[0].timeo.noop_out_timeout = 900 
+ 
+ # To specify the time to wait for abort response before
+ # failing the operation and trying a logical unit reset edit the line.
+-- 
+1.9.1
+

filesystem/iscsi-initiator-utils/centos/patches/0002-Add-dependency-against-network.service-to-iscsi-shut.patch

@@ -0,0 +1,25 @@
+From f1f45f8028b8ef5804e0c9ff4d7dd5be6d21fdb4 Mon Sep 17 00:00:00 2001
+From: Don Penney <don.penney@windriver.com>
+Date: Thu, 2 Nov 2017 11:00:17 -0400
+Subject: [PATCH] Add dependency against network.service to
+ iscsi-shutdown.service
+
+---
+ etc/systemd/iscsi-shutdown.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
+index fcb431a..35ee8ba 100644
+--- a/etc/systemd/iscsi-shutdown.service
++++ b/etc/systemd/iscsi-shutdown.service
+@@ -4,6 +4,7 @@ Documentation=man:iscsid(8) man:iscsiadm(8)
+ DefaultDependencies=no
+ Conflicts=shutdown.target
+ After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
++After=network.service
+ Before=remote-fs-pre.target
+ Wants=remote-fs-pre.target
+ RefuseManualStop=yes
+-- 
+1.8.3.1
+

filesystem/iscsi-initiator-utils/centos/srpm_path

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

filesystem/iscsi-initiator-utils/files/iscsi-cache.volatiles

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