aboutsummaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-11 23:37:40 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-12 11:28:51 +0000
commit9953f803f28a53d12e565184e9623f5b27032797 (patch)
tree19d150efe7a592d44e9a971d60985d1ac0a74160 /patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch
parentecf9055d532dae7f209e9f4591a8129dd52627b2 (diff)
Rework: Move m1.micro RAM bump to post-install.
Change-Id: I158c58cb01112d2113a75dd425275cf9531d49fc Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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.patch35
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