diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-13 11:10:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-13 11:10:27 +0000 |
| commit | 8357c5b886a0b1ab571aa766c26a822d8720a708 (patch) | |
| tree | bc56ebbaa2bd430bd4e2ed06a73a47974390f5ea /patches/fuel-library | |
| parent | 18e01e000ea30da07757e1ef8b9c82bb9305d059 (diff) | |
| parent | 9953f803f28a53d12e565184e9623f5b27032797 (diff) | |
Merge "Rework: Move m1.micro RAM bump to post-install."
Diffstat (limited to 'patches/fuel-library')
| -rw-r--r-- | patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch | 35 |
1 files changed, 0 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 |