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

Correct usage of BUILD_AND_INSTALL_TINYIPA

Browse Source 
This variable must be executable, so using True won't work. Since
true is the default in finalise-tinyipa, remove the explicit setting
from the role.

Also remove this variable from build-tinyipa since it's not used there
and update the documentation accordingly.

Change-Id: Ibe744121b863ef1265e5e3ead7ab13fef0855fc6
This commit is contained in:
Dmitry Tantsur 2019-09-25 15:53:20 +02:00
parent cd89c02671
commit 1eee1c17a4
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/admin/tinyipa.rst
View File

@ -103,13 +103,13 @@ Advanced options
(De)Optimizing the image (De)Optimizing the image
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~
If you want the build script to preinstall everything into the ramdisk, If you do not want the build script to preinstall everything into the ramdisk,
instead of loading some things at runtime (this results in a slightly bigger and instead load some things at runtime (this results in a slightly smaller
ramdisk), before running ``make`` or ``build-tinyipa.sh`` set: ramdisk), before running ``make`` or ``finalise-tinyipa.sh`` set:
.. code-block:: bash .. code-block:: bash
export BUILD_AND_INSTALL_TINYIPA=true export BUILD_AND_INSTALL_TINYIPA=false
By default, building tinyIPA will compile most of the Python code to By default, building tinyIPA will compile most of the Python code to
optimized ``*.pyo`` files, completely remove most of ``*.py`` and ``*.pyc`` optimized ``*.pyo`` files, completely remove most of ``*.py`` and ``*.pyc``

1
roles/ipa-build-tinyipa-image/tasks/main.yaml
View File

@ -4,7 +4,6 @@
chdir: '{{ tinyipa_dir }}' chdir: '{{ tinyipa_dir }}'
environment: environment:
BRANCH_PATH: '{{ ipa_branch_path }}' BRANCH_PATH: '{{ ipa_branch_path }}'
BUILD_AND_INSTALL_TINYIPA: True
IPA_SOURCE_DIR: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent' IPA_SOURCE_DIR: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent'
- name: Move resulting files - name: Move resulting files

1
tinyipa/build-tinyipa.sh
View File

@ -4,7 +4,6 @@ set -ex
WORKDIR=$(readlink -f $0 | xargs dirname) WORKDIR=$(readlink -f $0 | xargs dirname)
source ${WORKDIR}/tc-mirror.sh source ${WORKDIR}/tc-mirror.sh
BUILDDIR="$WORKDIR/tinyipabuild" BUILDDIR="$WORKDIR/tinyipabuild"
BUILD_AND_INSTALL_TINYIPA=${BUILD_AND_INSTALL_TINYIPA:-false}
TINYCORE_MIRROR_URL=${TINYCORE_MIRROR_URL:-} TINYCORE_MIRROR_URL=${TINYCORE_MIRROR_URL:-}
TINYIPA_REQUIRE_BIOSDEVNAME=${TINYIPA_REQUIRE_BIOSDEVNAME:-false} TINYIPA_REQUIRE_BIOSDEVNAME=${TINYIPA_REQUIRE_BIOSDEVNAME:-false}
TINYIPA_REQUIRE_IPMITOOL=${TINYIPA_REQUIRE_IPMITOOL:-true} TINYIPA_REQUIRE_IPMITOOL=${TINYIPA_REQUIRE_IPMITOOL:-true}