Merge lp:~fginther/adt-cloud-worker/bigger-testbed-take2 into lp:adt-cloud-worker

[Francis Ginther]

Bump the default instance flavour to cpu2-ram2-disk50.

Bump the default instance flavour to contain 400% more beef. Moooooooo!

[Celso Providelo (cprov)]

Thomi,

What do you think about dropping the flavor-logic entirely and use config.adt.flavor instead ?

review: Needs Information

[Thomi Richards (thomir-deactivatedaccount)]

Celso,

I thought about it, but this represents the smallest change required to get us the behaviour we need.

Also, I remember a discussion with you where we said it was easier to deploy code changes than config changes. What does using the config file get us, in that case?

Perhaps in the future we should rely on config file more though....

I'm easy either way. Let me know what you think.

[Celso Providelo (cprov)]

Thomi,

Yes, I continue to stand for code changes instead of config changes, but in this case it's a cloud-dependent option, i.e PS4 gets cpu2-ram2-disk50 but bootstack/canonistack get m1.small (or similar). We cannot hardcode it.

And despite of the fact that all the logic behind flavor discovering we landed being correct (custom -> default -> first) we never used it. So, that's why I'm suggesting it do be dropped.

[Francis Ginther (fginther)]

This is indeed the smallest possible change. It could be stripped down further, but I would not be surprised if this needs an additional update after some more proposed-migration surprises.

review: Approve

[Celso Providelo (cprov)]

Francis and Thomi,

I agree on stripping down the get_default_flavor() logic later.

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~thomir/adt-cloud-worker/trunk-use-even-more-beef into lp:adt-cloud-worker failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-adt-cloud-worker2g3yrp76/bin/python3
Also creating executable in /tmp/venv-adt-cloud-worker2g3yrp76/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 1))
Downloading/unpacking python-keystoneclient==1.2.0 (from -r requirements.txt (line 2))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 3))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking python-novaclient==2.22.0 (from -r requirements.txt (line 4))
Downloading/unpacking python-swiftclient==2.3.1 (from -r requirements.txt (line 5))
Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/anyjson/setup.py) egg_info for package anyjson

Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking six>=1.9.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking Babel>=1.3 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/Babel/setup.py) egg_info for package Babel

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
Downloading/unpacking iso8601>=0.1.9 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking PrettyTable>=0.7,<0.8 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/PrettyTable/setup.py) egg_info for package PrettyTable

Downloading/unpacking netaddr>=0.7.12 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking argparse (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.serialization>=1.2.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking stevedore>=1.1.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking requests>=2.2.0,!=2.4.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.i18n>=1.3.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.config>=1.6.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.utils>=1.2.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpackin...

[Celso Providelo (cprov)]

review: Approve

=== modified file 'adt_cloud_worker/_cloud_support.py'
--- adt_cloud_worker/_cloud_support.py	2015-03-20 14:55:26 +0000
+++ adt_cloud_worker/_cloud_support.py	2015-04-23 14:36:17 +0000
@@ -52,7 +52,7 @@
     flavor_names = [f.name for f in nova_query_flavor_fn()]
     # 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'
+    default = 'cpu2-ram2-disk50'
     # This is the alternative bootstack/cannistack/generic one.
     alternative = 'm1.small'
     if default in flavor_names:

=== modified file 'adt_cloud_worker/tests/test_cloud.py'
--- adt_cloud_worker/tests/test_cloud.py	2015-03-20 14:55:26 +0000
+++ adt_cloud_worker/tests/test_cloud.py	2015-04-23 14:36:17 +0000
@@ -47,9 +47,9 @@
             q = create_flavor_query_fn(['m1.smaller', 'm1.small'])
             cs.get_default_testbed_flavor(q)
             self.assertEqual(
-                "Custom flavor 'cpu2-ram2-disk10' not configured. Using "
+                "Custom flavor 'cpu2-ram2-disk50' not configured. Using "
                 "'m1.small' instead. To reduce testbed memory consumption, "
-                "configure the 'cpu2-ram2-disk10' flavor.\n",
+                "configure the 'cpu2-ram2-disk50' flavor.\n",
                 f.output
             )
 
@@ -69,7 +69,7 @@
             cs.get_default_testbed_flavor(q)
             self.assertEqual(
                 "Nova has not been configured with either the default flavor "
-                "(cpu2-ram2-disk10) of the alternative flavor (m1.small). "
+                "(cpu2-ram2-disk50) of the alternative flavor (m1.small). "
                 "Using the first reported flavor 'unknown' instead.\n",
                 f.output
             )