Merge lp:~fginther/adt-continuous-deployer/beefier-testbeds into lp:adt-continuous-deployer

Proposed by Francis Ginther on 2015-04-22
Status: Needs review
Proposed branch: lp:~fginther/adt-continuous-deployer/beefier-testbeds
Merge into: lp:adt-continuous-deployer
Diff against target: 12 lines (+1/-1)
1 file modified
mojo.py (+1/-1)
To merge this branch: bzr merge lp:~fginther/adt-continuous-deployer/beefier-testbeds
Reviewer Review Type Date Requested Status
Celso Providelo (community) 2015-04-22 Approve on 2015-04-22
Review via email: mp+257110@code.launchpad.net

Commit message

Use cpu2-ram2-disk50 (instead of cpu2-ram2-disk10) as default flavor for testbeds.

Description of the change

Use cpu2-ram2-disk50 (instead of cpu2-ram2-disk10) as default flavor for testbeds.

Resolves
 - https://trello.com/c/C2dm78ho/71-1-proposed-migration-need-beefier-testbeds-for-certain-packages

To post a comment you must log in.
Celso Providelo (cprov) wrote :

Francis,

Looks good, but configuration flavor only affects core-image-testing solution, adt-cloud-worker uses a dedicated method to calculate suitable flavors using nova API (_cloud_support/get_default_testbed_flavor) with 'cpu2-ram2-disk10' hardcoded as fallback.

The simplest way a see to get this solved is to submit another MP for adt-cloud-worker to replace the hardcoded value with the configuration one. Although, the whole flavor-logic is unnecessary IMO and we should simply use whatever is defined in the configuration.

Anyway, this fix is perfectly fine and effective for core-image-testing, so I am approving it.

review: Approve
Francis Ginther (fginther) wrote :

Celso, thanks for point that out. Will address that next.

Unmerged revisions

39. By Francis Ginther on 2015-04-22

Use cpu2-ram2-disk50 (instead of cpu2-ram2-disk10) as default flavor for testbeds.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mojo.py'
2--- mojo.py 2015-04-10 20:20:17 +0000
3+++ mojo.py 2015-04-22 14:24:22 +0000
4@@ -149,7 +149,7 @@
5 '--net-id={}'.format(args.network) if args.devel else '',
6 ]).strip()
7 computed_adt_image_flavor = (
8- 'cpu2-ram2-disk10' if not args.devel else 'm1.smaller')
9+ 'cpu2-ram2-disk50' if not args.devel else 'm1.smaller')
10
11 create_service_conf(
12 args.project,

Subscribers

People subscribed via source and target branches

to all changes: