openstack/ironic-python-agent-builder
Code Issues Proposed changes

tinyIPA: remove support for iSCSI deploy

Browse Source 
Change-Id: Ice5ba6acefbee68a9526cf482235fda0eeef5dc4
This commit is contained in:
Dmitry Tantsur 2021-05-10 12:49:25 +02:00
parent 9032aad2d3
commit 0e243c4e51
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/tinyipa-tgt-226f74125238c239.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The tinyIPA build no longer supports the ``iscsi`` deploy interface. Please
use version 2.6.0 or older for this.

10
tinyipa/build-tinyipa.sh
View File

@ -7,7 +7,6 @@ source ${WORKDIR}/common.sh
IRONIC_LIB_SOURCE=${IRONIC_LIB_SOURCE:-} IRONIC_LIB_SOURCE=${IRONIC_LIB_SOURCE:-}
TC_RELEASE="12.x" TC_RELEASE="12.x"
TGT_RELEASE="v1.0.80"
QEMU_RELEASE="v4.2.0" QEMU_RELEASE="v4.2.0"
LSHW_RELEASE="B.02.18" LSHW_RELEASE="B.02.18"
BIOSDEVNAME_RELEASE="0.7.2" BIOSDEVNAME_RELEASE="0.7.2"
@ -55,8 +54,7 @@ mkdir "$BUILDDIR"
# Configure mirror # Configure mirror
sudo sh -c "echo $TINYCORE_MIRROR_URL > $BUILDDIR/opt/tcemirror" sudo sh -c "echo $TINYCORE_MIRROR_URL > $BUILDDIR/opt/tcemirror"
# Download TGT, Qemu-utils, Biosdevname and IPMItool source # Download Qemu-utils, Biosdevname and IPMItool source
clone_single_branch "https://github.com/fujita/tgt.git" "${BUILDDIR}/tmp/tgt" "$TGT_RELEASE"
clone_single_branch "https://github.com/qemu/qemu.git" "${BUILDDIR}/tmp/qemu" "$QEMU_RELEASE" clone_single_branch "https://github.com/qemu/qemu.git" "${BUILDDIR}/tmp/qemu" "$QEMU_RELEASE"
clone_single_branch "https://github.com/lyonel/lshw.git" "${BUILDDIR}/tmp/lshw" "$LSHW_RELEASE" clone_single_branch "https://github.com/lyonel/lshw.git" "${BUILDDIR}/tmp/lshw" "$LSHW_RELEASE"
if $TINYIPA_REQUIRE_BIOSDEVNAME; then if $TINYIPA_REQUIRE_BIOSDEVNAME; then
@ -196,12 +194,6 @@ $CHROOT_CMD ${PIP_COMMAND} wheel -c /tmp/upper-constraints.txt --no-index --pre
echo Resulting wheels: echo Resulting wheels:
ls -1 $BUILDDIR/tmp/wheels ls -1 $BUILDDIR/tmp/wheels
# Build tgt
rm -rf $WORKDIR/build_files/tgt.tcz
$CHROOT_CMD /bin/sh -c "cd /tmp/tgt && make && make install-programs install-conf install-scripts DESTDIR=/tmp/tgt-installed"
find $BUILDDIR/tmp/tgt-installed/ -type f -executable | xargs file | awk -F ':' '/ELF/ {print $1}' | sudo xargs strip
cd $WORKDIR/build_files && mksquashfs $BUILDDIR/tmp/tgt-installed tgt.tcz && md5sum tgt.tcz > tgt.tcz.md5.txt
# Build qemu-utils # Build qemu-utils
rm -rf $WORKDIR/build_files/qemu-utils.tcz rm -rf $WORKDIR/build_files/qemu-utils.tcz
$CHROOT_CMD /bin/sh -c "cd /tmp/qemu && ./configure --disable-system --disable-user --disable-linux-user --disable-bsd-user --disable-guest-agent --disable-blobs --python=/usr/local/bin/$TINYIPA_PYTHON_EXE && make && make install DESTDIR=/tmp/qemu-utils" $CHROOT_CMD /bin/sh -c "cd /tmp/qemu && ./configure --disable-system --disable-user --disable-linux-user --disable-bsd-user --disable-guest-agent --disable-blobs --python=/usr/local/bin/$TINYIPA_PYTHON_EXE && make && make install DESTDIR=/tmp/qemu-utils"

2
tinyipa/finalise-tinyipa.sh
View File

@ -75,7 +75,6 @@ $CHROOT_CMD chmod u+x /sbin/ldconfig
# Copy python wheels from build to final dir # Copy python wheels from build to final dir
cp -Rp "$BUILDDIR/tmp/wheels" "$FINALDIR/tmp/wheelhouse" cp -Rp "$BUILDDIR/tmp/wheels" "$FINALDIR/tmp/wheelhouse"
cp $WORKDIR/build_files/tgt.* $FINALDIR/tmp/builtin/optional
cp $WORKDIR/build_files/qemu-utils.* $FINALDIR/tmp/builtin/optional cp $WORKDIR/build_files/qemu-utils.* $FINALDIR/tmp/builtin/optional
cp $WORKDIR/build_files/lshw.* $FINALDIR/tmp/builtin/optional cp $WORKDIR/build_files/lshw.* $FINALDIR/tmp/builtin/optional
@ -129,7 +128,6 @@ if $INSTALL_SSH ; then
fi fi
fi fi
$TC_CHROOT_CMD tce-load -ic /tmp/builtin/optional/tgt.tcz
$TC_CHROOT_CMD tce-load -ic /tmp/builtin/optional/qemu-utils.tcz $TC_CHROOT_CMD tce-load -ic /tmp/builtin/optional/qemu-utils.tcz
$TC_CHROOT_CMD tce-load -ic /tmp/builtin/optional/lshw.tcz $TC_CHROOT_CMD tce-load -ic /tmp/builtin/optional/lshw.tcz
if $TINYIPA_REQUIRE_BIOSDEVNAME; then if $TINYIPA_REQUIRE_BIOSDEVNAME; then