diff options
author | Florin Dumitrascu <florin.dumitrascu@enea.com> | 2016-03-08 14:17:01 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:11:58 +0000 |
commit | 0ef5c3265e8002e8b41d5b6f9c944bcdb09d7444 (patch) | |
tree | 177c1bfe7b6b1fb192b2c4f21da77b09215d21a7 /patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch | |
parent | 04fa0999720da454ee052ff97194fb982dd9b186 (diff) |
Add fixes and improvements for arm64 deployment
[ Florin Dumitrascu <florin.dumitrascu@enea.com> ]
* arm64 support for OpenDaylight Fuel Plugin
[ Stanislaw Kardach <kda@semihalf.com> ]
* Limit ESP to first drive
* Remove default+timeout+tr from cobbler profile
* Fix puppet syntax errors
* Disable usb tablet on aarch64
* Support direct kernel boot for CirrOS TestVM on aarch64
* Remove git version signature not to confuse patches-export
* Fix VGA support for CirrOS TestVM
* Makefile: Add clean-{docker,build}.
[ Alexandru Avadanii <Alexandru.Avadanii@enea.com> ]
* Performance: Use gzip instead of xz compression.
* Switch mirror proto from https to http.
* Update TODO with remaining tasks.
* Disable amd64 Liberty fixture (no multi-arch support yet).
* m1.micro: Increase RAM size to 128MB for aarch64 images.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
Signed-off-by: Stanislaw Kardach <kda@semihalf.com>
(cherry picked from commit 80ba8c45cda5308010ded08b3d070343a92d58b5)
Change-Id: I59823bc27b26e0749f27b6d39ed032847ca23fcd
Diffstat (limited to 'patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch')
-rw-r--r-- | patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch | 37 |
1 files changed, 37 insertions, 0 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 new file mode 100644 index 00000000..8253acad --- /dev/null +++ b/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch @@ -0,0 +1,37 @@ +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. +--- + .../osnailyfacter/modular/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/osnailyfacter/modular/openstack-controller/openstack-controller.pp b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp +index b1d8795..88e0ab3 100644 +--- a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp ++++ b/deployment/puppet/osnailyfacter/modular/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 +@@ -171,7 +171,7 @@ 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 + nova flavor-list | grep m1.micro; + status=("${PIPESTATUS[@]}"); |