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

Proposed by Celso Providelo on 2015-04-27
Status: Merged
Approved by: Celso Providelo on 2015-04-28
Approved revision: 41
Merged at revision: 39
Proposed branch: lp:~cprov/adt-cloud-worker/proxy
Merge into: lp:adt-cloud-worker
Diff against target: 35 lines (+8/-0)
2 files modified
adt-service.conf (+1/-0)
adt_cloud_worker/__init__.py (+7/-0)
To merge this branch: bzr merge lp:~cprov/adt-cloud-worker/proxy
Reviewer Review Type Date Requested Status
Francis Ginther Approve on 2015-04-28
Joe Talbott (community) 2015-04-27 Needs Information on 2015-04-27
Review via email: mp+257576@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Joe Talbott (joetalbott) wrote :

One question and one minor nit.

review: Needs Information
Celso Providelo (cprov) wrote :

Joe,

Thanks for the review, comments addressed.

Francis Ginther (fginther) wrote :

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

review: Approve
Ubuntu CI Bot (uci-bot) wrote :
Download full text (20.3 KiB)

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 updated on 2015-04-28
41. By Celso Providelo on 2015-04-28

Fixing flake issue.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'adt-service.conf'
2--- adt-service.conf 2015-04-22 03:16:11 +0000
3+++ adt-service.conf 2015-04-28 03:28:17 +0000
4@@ -1,6 +1,7 @@
5 # `adt-cloud-worker` configuration file.
6 [adt]
7 archive_mirror = http://nova.clouds.archive.ubuntu.com/ubuntu/
8+#http_proxy = http://squid.internal:3128/
9
10 [amqp]
11 uris = amqp://guest:guest@localhost:5672//
12
13=== modified file 'adt_cloud_worker/__init__.py'
14--- adt_cloud_worker/__init__.py 2015-04-22 03:16:11 +0000
15+++ adt_cloud_worker/__init__.py 2015-04-28 03:28:17 +0000
16@@ -110,6 +110,8 @@
17 adt_kwargs['nova_flavor'] = get_default_testbed_flavor()
18 adt_kwargs['archive_mirror'] = self.config.get(
19 'adt', 'archive_mirror')
20+ adt_kwargs['http_proxy'] = self.config.get(
21+ 'adt', 'http_proxy')
22 arguments = _make_adt_argument_list(adt_kwargs)
23 logger.info(
24 'Running adt-run with: %s', ' '.join(arguments),
25@@ -226,6 +228,11 @@
26 '--image', request_configuration['nova_image'],
27 '--mirror', request_configuration['archive_mirror'],
28 ]
29+
30+ proxy = request_configuration.get('http_proxy')
31+ if proxy:
32+ adt_ssh_nova_args += ['--proxy', proxy]
33+
34 if 'nova_extra_args' in request_configuration:
35 adt_ssh_nova_args += request_configuration['nova_extra_args']
36

Subscribers

People subscribed via source and target branches