Merge lp:~cprov/adt-cloud-worker/proxy into lp:adt-cloud-worker

[Celso Providelo]

Experimental [adt].http_proxy support for uci-nova.

Experimental [adt].http_proxy support for uci-nova.

[Joe Talbott (joetalbott)]

One question and one minor nit.

review: Needs Information

[Celso Providelo (cprov)]

Joe,

Thanks for the review, comments addressed.

[Francis Ginther (fginther)]

Looks good. Proxy will not be specified if it is omitted.

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~cprov/adt-cloud-worker/proxy 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-workermelaiwur/bin/python3
Also creating executable in /tmp/venv-adt-cloud-workermelaiwur/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-workermelaiwur/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 amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-adt-cloud-workermelaiwur/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-adt-cloud-workermelaiwur/build/anyjson/setup.py) egg_info for package anyjson

Downloading/unpacking Babel>=1.3 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-adt-cloud-workermelaiwur/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 oslo.config>=1.6.0 (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-workermelaiwur/build/PrettyTable/setup.py) egg_info for package PrettyTable

Downloading/unpacking stevedore>=1.1.0 (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 iso8601>=0.1.9 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking pbr>=0.6,!=0.7,<1.0 (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 requests>=2.2.0,!=2.4.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking six>=1.9.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/unpacking oslo.i18n>=1.3.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking netaddr>=0.7.1...

[lp:~cprov/adt-cloud-worker/proxy]

41. By Celso Providelo on 2015-04-28

Fixing flake issue.

=== modified file 'adt-service.conf'
--- adt-service.conf	2015-04-22 03:16:11 +0000
+++ adt-service.conf	2015-04-28 03:28:17 +0000
@@ -1,6 +1,7 @@
 # `adt-cloud-worker` configuration file.
 [adt]
 archive_mirror = http://nova.clouds.archive.ubuntu.com/ubuntu/
+#http_proxy = http://squid.internal:3128/
 
 [amqp]
 uris = amqp://guest:guest@localhost:5672//
 
=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-04-22 03:16:11 +0000
+++ adt_cloud_worker/__init__.py	2015-04-28 03:28:17 +0000
@@ -110,6 +110,8 @@
                 adt_kwargs['nova_flavor'] = get_default_testbed_flavor()
                 adt_kwargs['archive_mirror'] = self.config.get(
                     'adt', 'archive_mirror')
+                adt_kwargs['http_proxy'] = self.config.get(
+                    'adt', 'http_proxy')
                 arguments = _make_adt_argument_list(adt_kwargs)
                 logger.info(
                     'Running adt-run with: %s', ' '.join(arguments),
@@ -226,6 +228,11 @@
         '--image', request_configuration['nova_image'],
         '--mirror', request_configuration['archive_mirror'],
     ]
+
+    proxy = request_configuration.get('http_proxy')
+    if proxy:
+        adt_ssh_nova_args += ['--proxy', proxy]
+
     if 'nova_extra_args' in request_configuration:
         adt_ssh_nova_args += request_configuration['nova_extra_args']