Merge lp:~cprov/adt-cloud-worker/ps4-flavor into lp:adt-cloud-worker

[Celso Providelo]

Using a PS4 'canonical' nova flavor name "cpu2-ram2-disk10" instead of the custom "m1.adt.*".

Using a PS4 'canonical' nova flavor name "cpu2-ram2-disk10" instead of the custom "m1.adt.*".

Mainly because the "first flavor" fallback on ps4 is very poor choice, "cpu1-ram9-disk50".

We can revisit this change once we have better understand of jobs dynamics, but I am also inclined to move this responsibility away from the cloud-worker.

[Joe Talbott (joetalbott)]

I'm not in love with seeing a string repeated that many times but I'll survive. :-)

review: Approve

=== modified file 'adt_cloud_worker/_cloud_support.py'
--- adt_cloud_worker/_cloud_support.py	2015-03-17 20:27:47 +0000
+++ adt_cloud_worker/_cloud_support.py	2015-03-20 15:02:16 +0000
@@ -50,7 +50,10 @@
 
     """
     flavor_names = [f.name for f in nova_query_flavor_fn()]
-    default = 'm1.adt.large'
+    # XXX cprov 20150320: This is the preferred stackystack (ps4) flavor, we
+    # will work with IS to create specific flavors (m1.adt.*) soon.
+    default = 'cpu2-ram2-disk10'
+    # This is the alternative bootstack/cannistack/generic one.
     alternative = 'm1.small'
     if default in flavor_names:
         return default

=== modified file 'adt_cloud_worker/tests/test_cloud.py'
--- adt_cloud_worker/tests/test_cloud.py	2015-03-08 22:30:42 +0000
+++ adt_cloud_worker/tests/test_cloud.py	2015-03-20 15:02:16 +0000
@@ -47,9 +47,9 @@
             q = create_flavor_query_fn(['m1.smaller', 'm1.small'])
             cs.get_default_testbed_flavor(q)
             self.assertEqual(
-                "Custom flavor 'm1.adt.large' not configured. Using "
+                "Custom flavor 'cpu2-ram2-disk10' not configured. Using "
                 "'m1.small' instead. To reduce testbed memory consumption, "
-                "configure the 'm1.adt.large' flavor.\n",
+                "configure the 'cpu2-ram2-disk10' flavor.\n",
                 f.output
             )
 
@@ -69,8 +69,8 @@
             cs.get_default_testbed_flavor(q)
             self.assertEqual(
                 "Nova has not been configured with either the default flavor "
-                "(m1.adt.large) of the alternative flavor (m1.small). Using "
-                "the first reported flavor 'unknown' instead.\n",
+                "(cpu2-ram2-disk10) of the alternative flavor (m1.small). "
+                "Using the first reported flavor 'unknown' instead.\n",
                 f.output
             )