From 71ef5b7acb5815c678cda0c115e98e6b1d06e1aa Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 17 Mar 2014 15:25:10 -0400 Subject: openstack: add open-isci from git://github.com/DFE/HIPOS To support the cinder iscsi backend, we need iscsi-* recipes. The HIPOS layer contains a reference implementation, but has distro bindings that we must avoid. So for now, we make a copy and reference the other layer. Signed-off-by: Bruce Ashfield --- .../open-iscsi/files/initiatorname.iscsi | 1 + .../open-iscsi/files/iscsi-initiator | 4 + .../files/iscsi-initiator-targets.service | 15 ++++ .../open-iscsi/files/iscsi-initiator.service | 12 +++ .../open-iscsi/files/open-iscsi | 94 ++++++++++++++++++++++ .../open-iscsi/files/user.patch | 11 +++ .../open-iscsi/open-iscsi-kernel_2.0-873.bb | 27 +++++++ .../open-iscsi/open-iscsi-user_2.0-871.bb | 52 ++++++++++++ 8 files changed, 216 insertions(+) create mode 100644 meta-openstack/recipes-connectivity/open-iscsi/files/initiatorname.iscsi create mode 100644 meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator create mode 100644 meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator-targets.service create mode 100644 meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator.service create mode 100755 meta-openstack/recipes-connectivity/open-iscsi/files/open-iscsi create mode 100644 meta-openstack/recipes-connectivity/open-iscsi/files/user.patch create mode 100644 meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb create mode 100644 meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-871.bb diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/initiatorname.iscsi b/meta-openstack/recipes-connectivity/open-iscsi/files/initiatorname.iscsi new file mode 100644 index 0000000..842c2ab --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/initiatorname.iscsi @@ -0,0 +1 @@ +InitiatorName=HidaV diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator b/meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator new file mode 100644 index 0000000..7fa49a2 --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator @@ -0,0 +1,4 @@ +# default command line settings for open-iscsi's iscsid + +OPTS_ISCSID="" +OPTS_ISCSIADM="" diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator-targets.service b/meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator-targets.service new file mode 100644 index 0000000..564b2d2 --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator-targets.service @@ -0,0 +1,15 @@ +[Unit] +Description=Open-iSCSI initiator (i.e. client) target bindings +After=iscsi-initiator.service +Requires=iscsi-initiator.service + +[Service] +Type=oneshot +EnvironmentFile=/etc/default/iscsi-initiator +ExecStart=/usr/sbin/iscsiadm -m node --loginall=automatic $OPTS_ISCSIADM +ExecStop=/usr/sbin/iscsiadm -m node --logoutall=all $OPTS_ISCSIADM +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target + diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator.service b/meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator.service new file mode 100644 index 0000000..b139751 --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/iscsi-initiator.service @@ -0,0 +1,12 @@ +[Unit] +Description=Open-iSCSI initiator (i.e. client) service +After=syslog.target + +[Service] +EnvironmentFile=/etc/default/iscsi-initiator +ExecStartPre=/sbin/modprobe iscsi_tcp +ExecStart=/usr/sbin/iscsid -f $OPTS_ISCSID + +[Install] +WantedBy=multi-user.target + diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/open-iscsi b/meta-openstack/recipes-connectivity/open-iscsi/files/open-iscsi new file mode 100755 index 0000000..58d8ae1 --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/open-iscsi @@ -0,0 +1,94 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: +# Required-Start: +# Required-Stop: +# Default-Start: +# Default-Stop: +# Short-Description: Starts and stops the iSCSI initiator services and logins to default targets +### END INIT INFO +set -x +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/iscsid +ADM=/usr/sbin/iscsiadm +PIDFILE=/var/run/iscsid.pid + +[ -x "$DAEMON" ] || exit 0 + +if [ ! -d /sys/class/ ]; then + logger -t iscsi-initiator "iSCSI requires a mounted sysfs, not started." + exit 1 +fi + +nodestartup_re='s/^node\.conn\[0]\.startup[ ]*=[ ]*//p' + +RETVAL=0 + +start() { + logger -t iscsi-initiator "Starting iSCSI initiator service" "iscsid" + modprobe -q iscsi_tcp 2>/dev/null || : + modprobe -q ib_iser 2>/dev/null || : + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON + RETVAL=$? + logger -t iscsi-initiator "Command returned $RETVAL" + starttargets +} + +starttargets() { + logger -t iscsi-initiator "Setting up iSCSI targets" + $ADM -m node --loginall=automatic + logger -t iscsi-initiator OK +} + +stoptargets() { + logger -t iscsi-initiator "Disconnecting iSCSI targets" + sync + $ADM -m node --logoutall=all + logger -t iscsi-initiator OK +} + +stop() { + stoptargets + logger -t iscsi-initiator "Stopping iSCSI initiator service" + start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON + rm -f $PIDFILE + status=0 + modprobe -r ib_iser 2>/dev/null + if [ "$?" -ne "0" -a "$?" -ne "1" ]; then + status=1 + fi + modprobe -r iscsi_tcp 2>/dev/null + if [ "$?" -ne "0" -a "$?" -ne "1" ]; then + status=1 + fi + logger -t iscsi-initiator "Command returned $status" +} + +restart() { + stop + start +} + +restarttargets() { + stoptargets + starttargets +} + +status() { + #XXX FIXME: what to do here? + #status iscsid + # list active sessions + echo Current active iSCSI sessions: + $ADM -m session +} + +case "$1" in + start|starttargets|stop|stoptargets|restart|restarttargets|status) + $1 + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac +exit $RETVAL diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/user.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/user.patch new file mode 100644 index 0000000..767c508 --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/user.patch @@ -0,0 +1,11 @@ +diff -Nurd a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c +--- a/usr/iscsi_sysfs.c 2012-08-06 12:32:21.098233792 +0200 ++++ b/usr/iscsi_sysfs.c 2012-08-06 12:33:09.534233952 +0200 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include "log.h" + #include "initiator.h" diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb new file mode 100644 index 0000000..8d51460 --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720." +HOMEPAGE = "http://www.open-iscsi.org/" +LICENSE = "GPL" +MACHINE_KERNEL_PR_append = "a" +PR = "r2" + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI = " http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz " + + +S = "${WORKDIR}/open-iscsi-${PV}" +TARGET_CC_ARCH += "${LDFLAGS}" + +inherit module + +do_compile () { + oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' LDFLAGS="" kernel +} + +do_install() { + oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' LDFLAGS="" DESTDIR="${D}" install_kernel +} + + +SRC_URI[md5sum] = "8b8316d7c9469149a6cc6234478347f7" +SRC_URI[sha256sum] = "7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9" diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-871.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-871.bb new file mode 100644 index 0000000..593d791 --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-871.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720." +HOMEPAGE = "http://www.open-iscsi.org/" +LICENSE = "GPL" +PR = "r1" + +inherit systemd + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \ + file://user.patch \ + file://open-iscsi \ + file://initiatorname.iscsi \ + " + + +S = "${WORKDIR}/open-iscsi-${PV}" +TARGET_CC_ARCH += "${LDFLAGS}" + + +do_compile () { + oe_runmake user +} + +do_install () { + oe_runmake DESTDIR="${D}" install_user + cp -f "${WORKDIR}/open-iscsi" "${D}/etc/init.d/" + install -m 0644 ${WORKDIR}/initiatorname.iscsi ${D}/etc/iscsi/initiatorname.iscsi +} + + +SRC_URI[md5sum] = "0c403e8c9ad41607571ba0e6e8ff196e" +SRC_URI[sha256sum] = "bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb" + +# systemd support +PACKAGES =+ "${PN}-systemd" +SRC_URI_append = " file://iscsi-initiator \ + file://iscsi-initiator.service \ + file://iscsi-initiator-targets.service \ + " +RDEPENDS_${PN}-systemd += "${PN}" +FILES_${PN}-systemd += " ${base_libdir}/systemd \ + ${sysconfdir}/default/iscsi-initiator \ + " +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " + + +do_install_append () { + install -d ${D}${sysconfdir}/default/ + install -m 0644 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ +} -- cgit v1.2.3-54-g00ecf