Merge "Correct usage of BUILD_AND_INSTALL_TINYIPA"

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``

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

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}