blob: de115457c7713f974d7275a560fbb15caad45dbd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: 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
|
