Merge lp:~jshepher/nova/lp792156 into lp:~hudson-openstack/nova/trunk

Proposed by Justin Shepherd
Status: Merged
Approved by: Josh Kearney
Approved revision: 1123
Merged at revision: 1148
Proposed branch: lp:~jshepher/nova/lp792156
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 9 lines (+2/-0)
1 file modified
tools/pip-requires (+2/-0)
To merge this branch: bzr merge lp:~jshepher/nova/lp792156
Reviewer Review Type Date Requested Status
Josh Kearney (community) Approve
Vish Ishaya (community) Approve
Review via email: mp+63323@code.launchpad.net

Description of the change

paramiko is not installed into the venv, but is required by smoketests/base.py. Added paramiko to tools/pip-requires.

To post a comment you must log in.
Revision history for this message
Vish Ishaya (vishvananda) wrote :

good catch. LGTM. (admin smoketests also require nova_adminclient, perhaps it should go in the venv too?)

review: Approve
Revision history for this message
Justin Shepherd (jshepher) wrote :

I did not catch that one.. i guess i installed that package already on my laptop.

quick question.. this branch is at revno: 1121 (-22 behind trunk).. want me to delete branch and recreate?

Will also look at adding nova_adminclient.

Revision history for this message
Devin Carlen (devcamcar) wrote :

Vish is correct - we do require nova-adminclient for the admin tests currently. Can you please add it as well while we're at it?

Revision history for this message
Justin Shepherd (jshepher) wrote :

not a problem.. was in the middle of validating it as a missing dependency.

lp:~jshepher/nova/lp792156 updated
1122. By Justin Shepherd

merged trunk

1123. By Justin Shepherd

added nova_adminclient to tools/pip-requires

Revision history for this message
Justin Shepherd (jshepher) wrote :

Added nova_adminclient to tools/pip-requires.. it looks like this gets installed as a dependency but is not explicitly defined.

Revision history for this message
Josh Kearney (jk0) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/pip-requires'
2--- tools/pip-requires 2011-05-27 20:31:18 +0000
3+++ tools/pip-requires 2011-06-03 02:20:59 +0000
4@@ -33,3 +33,5 @@
5 coverage
6 nosexcover
7 GitPython
8+paramiko
9+nova_adminclient