diff options
| -rw-r--r-- | patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch | 35 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0035-m1.micro-Increase-profile-RAM-size-to-128MB.patch | 38 |
2 files changed, 38 insertions, 35 deletions
diff --git a/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch b/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch deleted file mode 100644 index 81377ad1..00000000 --- a/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Sun, 20 Mar 2016 18:24:04 +0100 -Subject: [PATCH] m1.micro: Increase profile RAM size to 128MB. - -TestVM (cirros) on aarch64 requires more than 64MB RAM. -Keep profiles uniform across all archs. ---- - .../openstack_tasks/manifests/openstack_controller/openstack_controller.pp | 2 +- - tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp -index b1d8795..88e0ab3 100644 ---- a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp -+++ b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp -@@ -233,7 +233,7 @@ if $primary_controller { - "OS_REGION_NAME=${region}", - "NOVA_ENDPOINT_TYPE=internalURL", - ], -- command => 'bash -c "nova flavor-create --is-public true m1.micro auto 64 0 1"', -+ command => 'bash -c "nova flavor-create --is-public true m1.micro auto 128 0 1"', - #FIXME(mattymo): Upstream bug PUP-2299 for retries in unless/onlyif - # Retry nova-flavor list until it exits 0, then exit with grep status, - # finally exit 1 if tries exceeded -diff --git a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb -index 36161e6..b15da07 100644 ---- a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb -+++ b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb -@@ -399,5 +399,5 @@ describe manifest do - if primary_controller - it 'should retry unless when creating m1.micro flavor' do - should contain_exec('create-m1.micro-flavor').with( -- 'command' => 'bash -c "nova flavor-create --is-public true m1.micro auto 64 0 1"', -+ 'command' => 'bash -c "nova flavor-create --is-public true m1.micro auto 128 0 1"', - 'unless' => 'bash -c \'for tries in {1..10}; do diff --git a/patches/opnfv-fuel/0035-m1.micro-Increase-profile-RAM-size-to-128MB.patch b/patches/opnfv-fuel/0035-m1.micro-Increase-profile-RAM-size-to-128MB.patch new file mode 100644 index 00000000..89720a2b --- /dev/null +++ b/patches/opnfv-fuel/0035-m1.micro-Increase-profile-RAM-size-to-128MB.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 128MB. + +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 0435a28..078f117 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 128MB. ++ OPENSTACK_VERSION=$(cat /etc/fuel_openstack_version) ++ CONTROLLER_PP="/etc/puppet/${OPENSTACK_VERSION}/modules/openstack_tasks" ++ CONTROLLER_PP+="/manifests/openstack_controller/openstack_controller.pp" ++ if [ -f ${CONTROLLER_PP} ]; then ++ sed -i.bak -r \ ++ 's/^(.*flavor-create.*m1\.micro auto)\s+[[:digit:]]+(.*)$/\1 128\2/' \ ++ ${CONTROLLER_PP} ++ echo "INFO: [64] => [128] updated m1.micro profile RAM size (MB)." ++ fi + fi + fi + |