Merge lp://staging/~thomir-deactivatedaccount/adt-cloud-worker/trunk-inine-uci-nova into lp://staging/adt-cloud-worker

Proposed by Thomi Richards
Status: Merged
Approved by: Celso Providelo
Approved revision: 40
Merged at revision: 40
Proposed branch: lp://staging/~thomir-deactivatedaccount/adt-cloud-worker/trunk-inine-uci-nova
Merge into: lp://staging/adt-cloud-worker
Diff against target: 552 lines (+481/-9)
4 files modified
README.rst (+0/-6)
adt_cloud_worker/__init__.py (+13/-1)
adt_cloud_worker/tests/test_cloud_worker.py (+3/-2)
uci-nova (+465/-0)
To merge this branch: bzr merge lp://staging/~thomir-deactivatedaccount/adt-cloud-worker/trunk-inine-uci-nova
Reviewer Review Type Date Requested Status
Paul Larson Approve
Francis Ginther Approve
Review via email: mp+257605@code.staging.launchpad.net

Commit message

Inline the uci-nova ssh setup script.

Description of the change

Inline the uci-nova ssh setup script. This MP changes the code to point to the new ssh setup script, but doesn't change the contents of the ssh setup script at all (that will happen next).

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Approve. This is consistent with the same change performed for lp:core-image-tester.

review: Approve
Revision history for this message
Paul Larson (pwlars) :
review: Approve
Revision history for this message
Ubuntu CI Bot (uci-bot) wrote :
Download full text (23.1 KiB)

The attempt to merge lp:~thomir/adt-cloud-worker/trunk-inine-uci-nova 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-workerko5r1052/bin/python3
Also creating executable in /tmp/venv-adt-cloud-workerko5r1052/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-workerko5r1052/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-workerko5r1052/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-workerko5r1052/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking argparse (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking netaddr>=0.7.12 (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-workerko5r1052/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.i18n>=1.3.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-workerko5r1052/build/PrettyTable/setup.py) egg_info for package PrettyTable

Downloading/unpacking iso8601>=0.1.9 (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.utils>=1.2.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.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 pbr>=0.6,!=0.7,<1.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking o...

40. By Thomi Richards

fix tests.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: