Merge lp://qastaging/~jordanrinke/nova/hypervupdate2 into lp://qastaging/~hudson-openstack/nova/trunk

Proposed by Jordan Rinke
Status: Work in progress
Proposed branch: lp://qastaging/~jordanrinke/nova/hypervupdate2
Merge into: lp://qastaging/~hudson-openstack/nova/trunk
Diff against target: 194 lines (+137/-15)
2 files modified
bin/nova-compute (+57/-7)
nova/virt/hyperv.py (+80/-8)
To merge this branch: bzr merge lp://qastaging/~jordanrinke/nova/hypervupdate2
Reviewer Review Type Date Requested Status
Todd Willey (community) Needs Fixing
Dan Prince (community) Needs Fixing
Review via email: mp+74499@code.qastaging.launchpad.net

Description of the change

I had to create a new branch on the local filesystem to fix the execute bit issue.

To post a comment you must log in.
Revision history for this message
Dan Prince (dan-prince) wrote :

+ image_id=instance['image_id'],

Should this be instance['image_ref']?

review: Needs Fixing
Revision history for this message
Jordan Rinke (jordanrinke) wrote :

> + image_id=instance['image_id'],
>
> Should this be instance['image_ref']?

Fixed.

Revision history for this message
Dan Prince (dan-prince) wrote :

Okay. One more thing (sorry I didn't catch this the first time)

The images.fetch call you are using is a bit outdated. Can you merge with nova trunk and update the call so that it passes the nova context as the first argument? We need this to support the ability to download images when using keystone w/ Glance.

review: Needs Fixing
Revision history for this message
Todd Willey (xtoddx) wrote :

There are a couple of spacing issues in hyperv.py

line 91, pass is space over one too far
98, Caption= should be in line with other arg, or 8 spaces indented
same for args to cache_image on 117-122
blank line at end of multiline docstrings
period for single line docstrings

review: Needs Fixing

Unmerged revisions

1533. By Jordan Rinke

image_id to image_ref changes per Dan

1532. By Jordan Rinke

comment typo fix

1531. By Jordan Rinke

new branch to fix execute bit issues and resulting merge problems

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.