Merge lp:~cprov/adt-continuous-deployer/flavor-and-udf-config-tweaks into lp:adt-continuous-deployer

[Celso Providelo]

Adjusting u-d-f configuration channel and bumping default adt image flavor configuration for PS4 and others supported clouds.

Adjusting u-d-f configuration channel and bumping default adt image flavor configuration for PS4 and others supported clouds.

[Francis Ginther (fginther)]

The channel value is correct for the updated u-d-f and channel names. I don't see the need to change m1.small to m1.smaller, but it doesn't impact production either, so I can go either way.

review: Approve

[Celso Providelo (cprov)]

Francis,

"m1.small" is the bootstack equivalent for cpu1-ram2-disk20 (when --devel is specified)

=== modified file 'mojo.py'
--- mojo.py	2015-04-10 20:20:17 +0000
+++ mojo.py	2015-04-22 21:05:15 +0000
@@ -56,7 +56,7 @@
     }
 
     c['image'] = {
-        'channel': 'ubuntu-core/devel-proposed',
+        'channel': 'ubuntu-core/rolling/edge',
         'device': 'generic_amd64',
         'location': '/tmp/latest-core-image-version',
         'poll_period': '60'
@@ -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.small')
 
     create_service_conf(
         args.project,