From 2741c6e75c660727177b9d32d5cf29c60b40eb25 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 13 May 2016 19:37:20 +0200 Subject: Rebase: p/fuel-library: Update after 96da5b4a. Refresh patches after: "Move openstack specific tasks to their own folder structure" NOTE: The qemu-kvm change patch (0003-Make-qemu-kvm-architecture-aware.patch) only affects RedHat systems, so it is optional, at least for the current stage. [1] https://github.com/openstack/fuel-library/commit/ 96da5b4a1eb82a76fb416d93f5249dc32e2499f2 Change-Id: Ibd1fd3f7e45d7947c90336bbe7e2ace101b5802b --- ....micro-Increase-profile-RAM-size-to-128MB.patch | 28 ++++++++++------------ 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch') 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 index 8253acad..81377ad1 100644 --- 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 @@ -5,33 +5,31 @@ 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 +- + .../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/osnailyfacter/modular/openstack-controller/openstack-controller.pp b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp +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/osnailyfacter/modular/openstack-controller/openstack-controller.pp -+++ b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp +--- 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 + "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 +@@ -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 - nova flavor-list | grep m1.micro; - status=("${PIPESTATUS[@]}"); -- cgit 1.2.3-korg