summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-256MB.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-01-21 18:34:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-01-21 18:34:06 +0000
commit4c74ad945b5b20be3014178070b495f10c16a74e (patch)
treef76b2e9892bd056b3da3a03a0ad27c5f8d2bb9ab /patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-256MB.patch
parent2662d9c5800b67d9375c22ccac439e3aeea3b4e5 (diff)
parente42a9b3011f96ad26f4a19db77ac44cad31a4290 (diff)
Merge "Uplift Armband to Fuel Newton"
Diffstat (limited to 'patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-256MB.patch')
-rw-r--r--patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-256MB.patch38
1 files changed, 38 insertions, 0 deletions
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
new file mode 100644
index 00000000..5f7a4949
--- /dev/null
+++ b/patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-256MB.patch
@@ -0,0 +1,38 @@
+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
+