1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2 Date: Sun, 20 Mar 2016 18:24:04 +0100
3 Subject: [PATCH] m1.micro: Increase profile RAM size to 128MB.
5 TestVM (cirros) on aarch64 requires more than 64MB RAM.
6 Keep profiles uniform across all archs.
8 .../osnailyfacter/modular/openstack-controller/openstack-controller.pp | 2 +-
9 tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb | 2 +-
10 2 files changed, 2 insertions(+), 2 deletions(-)
12 diff --git a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
13 index b1d8795..88e0ab3 100644
14 --- a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
15 +++ b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
16 @@ -233,7 +233,7 @@ if $primary_controller {
17 "OS_REGION_NAME=${region}",
18 "NOVA_ENDPOINT_TYPE=internalURL",
20 - command => 'bash -c "nova flavor-create --is-public true m1.micro auto 64 0 1"',
21 + command => 'bash -c "nova flavor-create --is-public true m1.micro auto 128 0 1"',
22 #FIXME(mattymo): Upstream bug PUP-2299 for retries in unless/onlyif
23 # Retry nova-flavor list until it exits 0, then exit with grep status,
24 # finally exit 1 if tries exceeded
25 diff --git a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
26 index 36161e6..b15da07 100644
27 --- a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
28 +++ b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
29 @@ -171,7 +171,7 @@ describe manifest do
31 it 'should retry unless when creating m1.micro flavor' do
32 should contain_exec('create-m1.micro-flavor').with(
33 - 'command' => 'bash -c "nova flavor-create --is-public true m1.micro auto 64 0 1"',
34 + 'command' => 'bash -c "nova flavor-create --is-public true m1.micro auto 128 0 1"',
35 'unless' => 'bash -c \'for tries in {1..10}; do
36 nova flavor-list | grep m1.micro;
37 status=("${PIPESTATUS[@]}");