Deprecate ironic-lib
Ironic-lib code has been rolled into Ironic-Python-Agent and Ironic where used; we no longer should support installing ironic-lib on master versions of IPA-builder. Depends-On: https://review.opendev.org/c/openstack/ironic-python-agent/+/937743 Change-Id: I29acfa275adc6aa3ec187883e6a096bf4038e9f6
This commit is contained in:
parent
ef33cc89e7
commit
2cab2e4143
@ -10,7 +10,6 @@ export LC_ALL=C.UTF-8
|
||||
|
||||
SCRIPTDIR=$(dirname $0)
|
||||
IPADIR=/tmp/ironic-python-agent
|
||||
IRLIBDIR=/tmp/ironic-lib
|
||||
UPPER_CONSTRAINTS=/tmp/requirements/upper-constraints.txt
|
||||
VENVDIR=/opt/ironic-python-agent
|
||||
|
||||
@ -46,12 +45,6 @@ $VENVDIR/bin/pip install -c $UPPER_CONSTRAINTS $IPADIR
|
||||
ln -s $VENVDIR/bin/ironic-python-agent /usr/local/bin/
|
||||
ln -s $VENVDIR/bin/ironic-collect-introspection-data /usr/local/bin/
|
||||
|
||||
# install ironic-lib from source if requested
|
||||
if [ ${IRONIC_LIB_FROM_SOURCE:-false} == "true" ]; then
|
||||
$VENVDIR/bin/pip install -c $UPPER_CONSTRAINTS -r $IRLIBDIR/requirements.txt
|
||||
$VENVDIR/bin/pip install $IRLIBDIR
|
||||
fi
|
||||
|
||||
case "$DIB_INIT_SYSTEM" in
|
||||
upstart)
|
||||
install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.conf /etc/init/ironic-python-agent.conf
|
||||
|
@ -1 +0,0 @@
|
||||
ironic-lib git /tmp/ironic-lib https://opendev.org/openstack/ironic-lib
|
@ -84,14 +84,6 @@ To use a specific branch of ironic-python-agent, use:
|
||||
export DIB_REPOREF_ironic_python_agent=origin/stable/queens
|
||||
export DIB_REPOREF_requirements=origin/stable/queens
|
||||
|
||||
To build ironic-lib from source, do:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
export IRONIC_LIB_FROM_SOURCE=true
|
||||
# Optionally:
|
||||
#export DIB_REPOREF_ironic_lib=<branch>
|
||||
|
||||
To build image for architectures other than amd64, you can either set the
|
||||
``ARCH`` environment variable or use ``-a`` to specify the target
|
||||
architecture:
|
||||
|
@ -154,18 +154,6 @@ If you want to collect BIOS given names of NICs in the inventory, set
|
||||
|
||||
export TINYIPA_REQUIRE_BIOSDEVNAME=true
|
||||
|
||||
Using ironic-lib from source
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
ironic-lib_ contains important parts of the provisioning logic. If you would
|
||||
like to build an IPA image with your local checkout of ironic-lib_, export
|
||||
the following variable:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
export IRONIC_LIB_SOURCE=/absolute/path/to/ironic-lib/checkout
|
||||
|
||||
|
||||
.. _Ironic Python Agent: https://docs.openstack.org/ironic-python-agent
|
||||
.. _TinyCoreLinux: http://tinycorelinux.net
|
||||
.. _ironic-lib: https://opendev.org/openstack/ironic-lib
|
||||
|
@ -22,12 +22,3 @@ rebuilding an image with the following procedure.
|
||||
DIB_REPOREF_ironic_python_agent=my-test-branch \
|
||||
ironic-python-agent-builder -o my-ipa --release 9-stream centos
|
||||
|
||||
#. A similar process (with one additional variable) can be used for ironic-lib
|
||||
changes:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
DIB_REPOLOCATION_ironic_lib=/home/user/path/to/repo \
|
||||
DIB_REPOREF_ironic_lib=my-test-branch \
|
||||
IRONIC_LIB_FROM_SOURCE=true \
|
||||
ironic-python-agent-builder -o my-ipa --release 9-stream centos
|
||||
|
@ -82,14 +82,6 @@ $PYTHON_COMMAND setup.py sdist --dist-dir "$BUILDDIR/tmp/localpip" --quiet
|
||||
ls $BUILDDIR/tmp/localpip || true
|
||||
cp requirements.txt $BUILDDIR/tmp/ipa-requirements.txt
|
||||
|
||||
if [ -n "$IRONIC_LIB_SOURCE" ]; then
|
||||
pushd $IRONIC_LIB_SOURCE
|
||||
rm -rf *.egg-info
|
||||
$PYTHON_COMMAND setup.py sdist --dist-dir "$BUILDDIR/tmp/localpip" --quiet
|
||||
cp requirements.txt $BUILDDIR/tmp/ironic-lib-requirements.txt
|
||||
popd
|
||||
fi
|
||||
|
||||
if [ -n "$PYTHON_EXTRA_SOURCES_DIR_LIST" ]; then
|
||||
IFS="," read -ra PKGDIRS <<< "$PYTHON_EXTRA_SOURCES_DIR_LIST"
|
||||
for PKGDIR in "${PKGDIRS[@]}"; do
|
||||
@ -105,9 +97,6 @@ if [ -n "$PYTHON_EXTRA_SOURCES_DIR_LIST" ]; then
|
||||
fi
|
||||
|
||||
$WORKDIR/generate_tox_constraints.sh upper-constraints.txt
|
||||
if [ -n "$IRONIC_LIB_SOURCE" ]; then
|
||||
sed -i '/ironic-lib/d' upper-constraints.txt $BUILDDIR/tmp/ipa-requirements.txt
|
||||
fi
|
||||
cp upper-constraints.txt $BUILDDIR/tmp/upper-constraints.txt
|
||||
echo Using upper-constraints:
|
||||
cat upper-constraints.txt
|
||||
@ -165,10 +154,6 @@ $CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip
|
||||
$CHROOT_CMD ${PIP_COMMAND} install --upgrade pip==${PIP_VERSION} wheel
|
||||
$CHROOT_CMD ${PIP_COMMAND} install pbr
|
||||
$CHROOT_CMD ${PIP_COMMAND} wheel -c /tmp/upper-constraints.txt --wheel-dir /tmp/wheels -r /tmp/ipa-requirements.txt
|
||||
if [ -n "$IRONIC_LIB_SOURCE" ]; then
|
||||
$CHROOT_CMD ${PIP_COMMAND} wheel -c /tmp/upper-constraints.txt --wheel-dir /tmp/wheels -r /tmp/ironic-lib-requirements.txt
|
||||
$CHROOT_CMD ${PIP_COMMAND} wheel -c /tmp/upper-constraints.txt --no-index --pre --wheel-dir /tmp/wheels --find-links=/tmp/localpip --find-links=/tmp/wheels ironic-lib
|
||||
fi
|
||||
|
||||
if [ -n "$PYTHON_EXTRA_SOURCES_DIR_LIST" ]; then
|
||||
IFS="," read -ra PKGDIRS <<< "$PYTHON_EXTRA_SOURCES_DIR_LIST"
|
||||
|
Loading…
x
Reference in New Issue
Block a user