From 1eee1c17a4d4f4c9b2e424342d068a4617761d22 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 25 Sep 2019 15:53:20 +0200 Subject: [PATCH] Correct usage of BUILD_AND_INSTALL_TINYIPA 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 --- doc/source/admin/tinyipa.rst | 8 ++++---- roles/ipa-build-tinyipa-image/tasks/main.yaml | 1 - tinyipa/build-tinyipa.sh | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/source/admin/tinyipa.rst b/doc/source/admin/tinyipa.rst index 634da4b..520f9b0 100644 --- a/doc/source/admin/tinyipa.rst +++ b/doc/source/admin/tinyipa.rst @@ -103,13 +103,13 @@ Advanced options (De)Optimizing the image ~~~~~~~~~~~~~~~~~~~~~~~~ -If you want the build script to preinstall everything into the ramdisk, -instead of loading some things at runtime (this results in a slightly bigger -ramdisk), before running ``make`` or ``build-tinyipa.sh`` set: +If you do not want the build script to preinstall everything into the ramdisk, +and instead load some things at runtime (this results in a slightly smaller +ramdisk), before running ``make`` or ``finalise-tinyipa.sh`` set: .. 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 optimized ``*.pyo`` files, completely remove most of ``*.py`` and ``*.pyc`` diff --git a/roles/ipa-build-tinyipa-image/tasks/main.yaml b/roles/ipa-build-tinyipa-image/tasks/main.yaml index d9acb63..68fdb4b 100644 --- a/roles/ipa-build-tinyipa-image/tasks/main.yaml +++ b/roles/ipa-build-tinyipa-image/tasks/main.yaml @@ -4,7 +4,6 @@ chdir: '{{ tinyipa_dir }}' environment: BRANCH_PATH: '{{ ipa_branch_path }}' - BUILD_AND_INSTALL_TINYIPA: True IPA_SOURCE_DIR: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent' - name: Move resulting files diff --git a/tinyipa/build-tinyipa.sh b/tinyipa/build-tinyipa.sh index 2b7d2f2..7060745 100755 --- a/tinyipa/build-tinyipa.sh +++ b/tinyipa/build-tinyipa.sh @@ -4,7 +4,6 @@ set -ex WORKDIR=$(readlink -f $0 | xargs dirname) source ${WORKDIR}/tc-mirror.sh BUILDDIR="$WORKDIR/tinyipabuild" -BUILD_AND_INSTALL_TINYIPA=${BUILD_AND_INSTALL_TINYIPA:-false} TINYCORE_MIRROR_URL=${TINYCORE_MIRROR_URL:-} TINYIPA_REQUIRE_BIOSDEVNAME=${TINYIPA_REQUIRE_BIOSDEVNAME:-false} TINYIPA_REQUIRE_IPMITOOL=${TINYIPA_REQUIRE_IPMITOOL:-true}