MCP: Remove all Fuel patches and plugins

Chances are none of the old patches / plugins can be reused as-is,
so remove all of them and prepare for the switch to MCP.

Change-Id: I999927a43b438d9bda9ff118731e2af4b1fa8caa
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

7 files changed, 0 insertions, 389 deletions

diff --git a/patches/opnfv-fuel/cross-bootstrap/0001-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/cross-bootstrap/0001-UX-Update-bootstrap-target-build-time-estimate.patch
deleted file mode 100644
index bc88e124..00000000
--- a/patches/opnfv-fuel/cross-bootstrap/0001-UX-Update-bootstrap-target-build-time-estimate.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Mon, 9 May 2016 17:05:53 +0200
-Subject: [PATCH] UX: Update bootstrap/target build time estimate.
-
-While building for a different architecture (e.g. AArch64 on x86_64),
-the bootstrap/target image build may take longer, due to latency
-introduced by using qemu-user-static.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- .../0001-Patches-for-OPNFV.patch | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
-index 446d0b6..c2e664c 100644
---- a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
-+++ b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
-@@ -10,5 +10,20 @@ diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
- --- a/iso/bootstrap_admin_node.sh
- +++ b/iso/bootstrap_admin_node.sh
-+@@ -86,9 +86,11 @@
-+ http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/bootstrap/\
-+ bootstrap_troubleshoot.html"
-+ bs_progress_message="There is no active bootstrap. Bootstrap image building \
-+-is in progress. Usually it takes 15-20 minutes. It depends on your internet \
-+-connection and hardware performance. After bootstrap image becomes available, \
-+-reboot nodes that failed to be discovered."
-++is in progress. Usually it takes 15-20 minutes for a native build (x86_64) \
-++and/or 30-45 minutes for each cross-build (e.g. AArch64). \
-++It depends on your internet connection, hardware performance and selected \
-++bootstrap architecture(s). This ISO supports AArch64 only. After bootstrap \
-++image becomes available, reboot nodes that failed to be discovered."
-+ bs_done_message="Default bootstrap image building done. Now you can boot new \
-+ nodes over PXE, they will be discovered and become available for installing \
-+ OpenStack on them"
- @@ -347,8 +347,23 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail
-  set +x
-  echo "Done!"
diff --git a/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch
deleted file mode 100644
index ae7de06a..00000000
--- a/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB, Cavium and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Date: Thu, 3 Mar 2016 19:04:07 +0100
-Subject: [PATCH] Build bootstrap image for arm64
-
-For now the arch is hardcoded for simplicity. We should detect this
-but how? If we're multi-arch then one bootstrap image should be built
-per supported arch. This requires Fuel refactoring.
----
- .../0001-Patches-for-OPNFV.patch        | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
---- a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
-+++ b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
-@@ -45,3 +45,12 @@
-  # Enable iptables
-  systemctl enable iptables.service
-+@@ -484,7 +490,7 @@
-+         local ret=1
-+         echo ${bs_progress_message} >&2
-+         set_ui_bootstrap_error "${bs_progress_message}" >&2
-+-        if fuel-bootstrap -v --debug build --activate >>"$bs_build_log" 2>&1; then
-++        if fuel-bootstrap -v --debug build --target_arch arm64 --activate >>"$bs_build_log" 2>&1; then
-+           ret=0
-+           fuel notify --topic "done" --send "${bs_done_message}"
-+         else
- @@ -546,6 +560,16 @@ systemctl start ntpd
diff --git a/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch b/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch
deleted file mode 100644
index 7158e3ab..00000000
--- a/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 9 Jun 2016 19:46:56 +0200
-Subject: [PATCH] post-scripts: Enable systemd-binfmt for first boot.
-
-IMPORTANT:
-This commit introduces the following file on Fuel Master,
-containing the list of arch supported for target nodes:
-</etc/fuel_openstack_arch>.
-
-This file is created AFTER pre.d OPNFV scripts are ran, also by
-bootstrap_admin_node.sh, BEFORE the post.d scripts are executed.
-NOTE: Arch format is the same used by dpkg (e.g.: "amd64 arm64")
-
-Based on the number of foreign architectures we should support
-(the list of archs in /etc/fuel_openstack_arch minus native arch),
-we determine whether cross-builds are expected, in which case
-binfmt support should be functional during first Fuel Master boot.
-
-Since systemd-binfmt service has a series of preconditions for
-starting, which are tested early during first boot, some of them
-are NOT YET true (e.g. no binfmt handlers are present before
-qemu-user-static package is installed), so the service is not
-automatically started. Of course, this only affects the first boot.
-
-Finally, this commit adds an OPNFV post-install script in
-/opt/opnfv/bootstrap/post.d, which starts systemd-binfmt service.
----
- .../post-scripts/80_prepare_cross_builds.sh        | 32 ++++++++++++++++++++++
- ...PNFV-Additions-to-bootstrap_admin_node.sh.patch | 13 +++++++++
- 2 files changed, 45 insertions(+)
- create mode 100755 build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-
-diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-new file mode 100755
-index 0000000..01eb2e2
---- /dev/null
-+++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-@@ -0,0 +1,32 @@
-+#/bin/sh
-+##############################################################################
-+# Copyright (c) 2016 Enea AB and others.
-+# Alexandru.Avadanii@enea.com
-+# All rights reserved. This program and the accompanying materials
-+# are made available under the terms of the Apache License, Version 2.0
-+# which accompanies this distribution, and is available at
-+# http://www.apache.org/licenses/LICENSE-2.0
-+##############################################################################
-+
-+echo "Preparing for cross-building bootstrap/target images"
-+
-+# Fmt handlers are set up by qemu-user-static (after systemd-binfmt
-+# prerequisites are checked during first boot of Fuel Master node).
-+
-+# Cross-building support provides dpkg, as a fuel-agent dependency
-+if which dpkg > /dev/null 2>&1; then
-+  # /etc/fuel_openstack_arch is created by bootstrap_admin_node.sh
-+  FOREIGN_ARCH_CNT=$(sed -e "s/$(dpkg --print-architecture)//" \
-+    /etc/fuel_openstack_arch | wc -w)
-+  if [ ${FOREIGN_ARCH_CNT} -gt 0 ]; then
-+    # If no fmt handlers are configured, the service is not started,
-+    # so request it explicitly (only necessary for the first boot).
-+    systemctl start systemd-binfmt
-+    if [ $? -ne 0 ]; then
-+      echo "Error starting systemd-binfmt!"
-+      exit 1
-+    fi
-+  fi
-+fi
-+
-+echo "Done preparing cross-building"
-diff --git a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
-index 12d0dfb..81d196b 100644
---- a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
-+++ b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
-@@ -25,6 +25,18 @@ index 3197c91..db3123d 100755
-  bs_done_message="Default bootstrap image building done. Now you can boot new \
-  nodes over PXE, they will be discovered and become available for installing \
-  OpenStack on them"
-+@@ -239,5 +239,11 @@
-+ # /etc/fuel_openstack_version is provided by 'fuel-openstack-metadata' package
-+ OPENSTACK_VERSION=$(cat /etc/fuel_openstack_version)
-+
-++# FIXME(armband): This part might be moved to an earlier stage later
-++# /etc/fuel_openstack_arch is constructed based on local mirror metadata
-++grep -oP "^Architectures: \K.*$" \
-++    ${wwwdir}/${OPENSTACK_VERSION}/ubuntu/x86_64/dists/mos${FUEL_RELEASE}/Release > \
-++    /etc/fuel_openstack_arch
-++
-+
-+ touch /var/lib/hiera/common.yaml /etc/puppet/hiera.yaml
- @@ -347,8 +347,23 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail
-  set +x
-  echo "Done!"
diff --git a/patches/opnfv-fuel/cross-bootstrap/0005-mcagent-Increase-max-shell-command-timeout-to-2h.patch b/patches/opnfv-fuel/cross-bootstrap/0005-mcagent-Increase-max-shell-command-timeout-to-2h.patch
deleted file mode 100644
index 74713638..00000000
--- a/patches/opnfv-fuel/cross-bootstrap/0005-mcagent-Increase-max-shell-command-timeout-to-2h.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB, Cavium and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 9 Jun 2016 21:37:48 +0200
-Subject: [PATCH] mcagent: Increase max shell command timeout to 2h
-
-Since `execute_shell_command` mcagent is used for building the target
-image and the timeout provided in the astute task is just respected on
-the Astute level (on mcollective level this timeout is actually a
-minumum between value provided and ddl value) we need to increase it
-for Armband operation.
-
-Because Armband builds the target image via `qemu-debootstrap`, it can
-take more than 1 hour to finish the building. Therefore aside of
-increasing the timeout in the Astute task, the maximum timeout value
-for mcagent has to be increased.
-
-[ Alexandru Avadanii ]
-Repackaged, based on Stan's `fuel-astute` patch.
-
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- .../f_bootstrap/post-scripts/80_prepare_cross_builds.sh    | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-index 01eb2e2..12f66e6 100755
---- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-+++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-@@ -26,6 +26,20 @@ if which dpkg > /dev/null 2>&1; then
-       echo "Error starting systemd-binfmt!"
-       exit 1
-     fi
-+
-+    # Cross-build timeout adjustments
-+    #
-+    # Since `execute_shell_command` mcagent is used for building the target
-+    # image and the timeout provided in the astute task is just respected on
-+    # the Astute level (on mcollective level this timeout is actually a
-+    # minumum between value provided and ddl value) we need to increase it
-+    # for cross-build operations.
-+
-+    # Building the target image via `qemu-debootstrap` can take more than
-+    # 1 hour. Therefore aside of increasing the timeout in the Astute task,
-+    # the maximum timeout value for mcagent has to be increased (use 2h).
-+    sed -i.bak -r 's/^(\s+:timeout\s*=>)\s*[[:digit:]]+$/\1 7200/' \
-+      /usr/libexec/mcollective/mcollective/agent/execute_shell_command.ddl
-   fi
- fi
-
diff --git a/patches/opnfv-fuel/cross-bootstrap/0006-bootstrap-Use-gzip-instead-of-xz-compression.patch b/patches/opnfv-fuel/cross-bootstrap/0006-bootstrap-Use-gzip-instead-of-xz-compression.patch
deleted file mode 100644
index a906a7a2..00000000
--- a/patches/opnfv-fuel/cross-bootstrap/0006-bootstrap-Use-gzip-instead-of-xz-compression.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Fri, 10 Jun 2016 22:30:29 +0200
-Subject: [PATCH] bootstrap: Use gzip instead of xz compression.
-
-bootstrap mksquashfs using qemu-user-static is extremely slow,
-taking up to one hour. gzip, on the other hand, is reasonably fast.
-According to [1], xz is slower, with not much size gain.
-
-[1] https://jonathancarter.org/2015/04/06/squashfs-performance-testing/
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- .../post-scripts/80_prepare_cross_builds.sh           | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-index 12f66e6..3cb22f3 100755
---- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-+++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-@@ -27,6 +27,11 @@ if which dpkg > /dev/null 2>&1; then
-       exit 1
-     fi
-
-+    # Determine python site-packages directory location
-+    PYTHON_SITEPKGS_DIR=$(python -c \
-+      "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-+    [ -d ${PYTHON_SITEPKGS_DIR} ] || exit 1
-+
-     # Cross-build timeout adjustments
-     #
-     # Since `execute_shell_command` mcagent is used for building the target
-@@ -40,6 +45,20 @@ if which dpkg > /dev/null 2>&1; then
-     # the maximum timeout value for mcagent has to be increased (use 2h).
-     sed -i.bak -r 's/^(\s+:timeout\s*=>)\s*[[:digit:]]+$/\1 7200/' \
-       /usr/libexec/mcollective/mcollective/agent/execute_shell_command.ddl
-+
-+    # Bootstrap: Use gzip instead of xz compression.
-+    #
-+    # bootstrap mksquashfs via `qemu-user-static` is extremely slow,
-+    # taking up to one hour. gzip, on the other hand, is reasonably fast.
-+
-+    # See the following article for a comparison between gzip and xz
-+    # https://jonathancarter.org/2015/04/06/squashfs-performance-testing/
-+    # xz is slower, with very little size gain.
-+    if [ -f ${PYTHON_SITEPKGS_DIR}/fuel_bootstrap/consts.py ]; then
-+      sed -i.bak -r "s/^(\s+'compress_format'\s*:\s*').*?('.*)$/\1gzip\2/g" \
-+        ${PYTHON_SITEPKGS_DIR}/fuel_bootstrap/consts.py
-+      echo "INFO: [xz] => [gzip] updated bootstrap initrd / rootfs compression."
-+    fi
-   fi
- fi
-
diff --git a/patches/opnfv-fuel/cross-bootstrap/0007-Nailgun-Increase-target-image-build-timeout.patch b/patches/opnfv-fuel/cross-bootstrap/0007-Nailgun-Increase-target-image-build-timeout.patch
deleted file mode 100644
index c762fabd..00000000
--- a/patches/opnfv-fuel/cross-bootstrap/0007-Nailgun-Increase-target-image-build-timeout.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB, Cavium and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 11 Jun 2016 21:37:29 +0200
-Subject: [PATCH] Nailgun: Increase target image build timeout
-
-Currently we're close to 40 minutes of image building (thanks to
-qemu-debootstrap). If network connectivity is a bit slow (happened to
-me) it's easy to go over 1h limit. Therefore let's push this to 2 hours
-to be safer.
-
-[ Alexandru Avadanii ]
-Moved original patch wrote by Stan to post-install.
-
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- .../f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh  | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-index 3cb22f3..c106bc3 100755
---- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-+++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-@@ -45,6 +45,13 @@ if which dpkg > /dev/null 2>&1; then
-     # the maximum timeout value for mcagent has to be increased (use 2h).
-     sed -i.bak -r 's/^(\s+:timeout\s*=>)\s*[[:digit:]]+$/\1 7200/' \
-       /usr/libexec/mcollective/mcollective/agent/execute_shell_command.ddl
-+    # Update nailgun timeout setting (2h)
-+    if [ -f ${PYTHON_SITEPKGS_DIR}/nailgun/settings.yaml ]; then
-+      sed -i.bak -r \
-+        's/^(PROVISIONING_IMAGES_BUILD_TIMEOUT:)\s*[[:digit:]]+$/\1 7200/' \
-+        ${PYTHON_SITEPKGS_DIR}/nailgun/settings.yaml
-+      echo "INFO: [1h] => [2h] updated nailgun image build timeout."
-+    fi
-
-     # Bootstrap: Use gzip instead of xz compression.
-     #
diff --git a/patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-256MB.patch b/patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-256MB.patch
deleted file mode 100644
index de115457..00000000
--- a/patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-256MB.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 11 Jun 2016 23:34:48 +0200
-Subject: [PATCH] m1.micro: Increase profile RAM size to 256MB.
-
-TestVM (cirros) on aarch64 requires more than 64MB RAM.
-Keep profiles uniform across all archs.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- .../f_bootstrap/post-scripts/80_prepare_cross_builds.sh   | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-index c106bc3..0b48ca2 100755
---- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-+++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-@@ -66,6 +66,21 @@ if which dpkg > /dev/null 2>&1; then
-         ${PYTHON_SITEPKGS_DIR}/fuel_bootstrap/consts.py
-       echo "INFO: [xz] => [gzip] updated bootstrap initrd / rootfs compression."
-     fi
-+
-+    # TestVM (cirros) adjustments for cross-arch
-+    #
-+    # TestVM (cirros) on aarch64 requires more than 64MB RAM.
-+    # Keep profiles uniform across all archs by bumping micro flavor specs.
-+    # m1.micro: Increase profile RAM size to 256MB.
-+    OPENSTACK_VERSION=$(cat /etc/fuel_openstack_version)
-+    CONTROLLER_PP="/etc/puppet/${OPENSTACK_VERSION}/modules/openstack_tasks"
-+    CONTROLLER_PP+="/manifests/roles/controller.pp"
-+    if [ -f ${CONTROLLER_PP} ]; then
-+      sed -i.bak -r \
-+        's/^(.*ram.*=>)\s+[[:digit:]]+(.*)$/\1 256\2/' \
-+        ${CONTROLLER_PP}
-+      echo "INFO: [64] => [256] updated m1.micro profile RAM size (MB)."
-+    fi
-   fi
- fi
-