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

[Francis Ginther]

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

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

[Celso Providelo (cprov)]

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)]

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.

=== modified file 'mojo.py'
--- mojo.py	2015-04-10 20:20:17 +0000
+++ mojo.py	2015-04-22 14:24:22 +0000
@@ -149,7 +149,7 @@
         '--net-id={}'.format(args.network) if args.devel else '',
     ]).strip()
     computed_adt_image_flavor = (
-        'cpu2-ram2-disk10' if not args.devel else 'm1.smaller')
+        'cpu2-ram2-disk50' if not args.devel else 'm1.smaller')
 
     create_service_conf(
         args.project,