OpenStack Compute (nova)

Merge lp://qastaging/~use/nova/shared-storage into lp://qastaging/~hudson-openstack/nova/trunk

  1. shared-storage
  2. Merge into trunk
Proposed by USE Team
Status: Needs review
Proposed branch: lp://qastaging/~use/nova/shared-storage
Merge into: lp://qastaging/~hudson-openstack/nova/trunk
Diff against target: 176 lines (+88/-7)
3 files modified
Authors (+1/-0)
nova/virt/xenapi/vm_utils.py (+41/-0)
plugins/xenserver/xenapi/etc/xapi.d/plugins/glance (+46/-7)
To merge this branch: bzr merge lp://qastaging/~use/nova/shared-storage
Reviewer Review Type Date Requested Status
Matt Dietz (community) Needs Fixing
Thierry Carrez (community) ffe Abstain
Jason Kölker (community) Approve
Christopher MacGown Pending
Review via email: mp+73466@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2011-08-29.

Description of the change

The current openstack+glance+xenserver environment is not (HBA) shared storage friendly. We can get around this for Linux by (mis-)labelling the HBA LUN local-storage. Unfortunately this does not work for Windows images as they are uploaded in VHD format and XenServer expects them to be VDIs.

This adds a parameter 'staging_path', to the upload_vhd xenapi call which causes the VHD to be loaded into an NFS share that has been labelled 'other-config:i18n-key=scratchnfs_storage', and uses the internal VDI.copy to transfer it to the HBA LUN labelled as local-storage.

This functionality leaves everything else the same, unless there is a share with the scratchnfs_storage label.

Update: Added "Jeff Williams <email address hidden>"
Update: Remove Copyright Headers for Infospace

To post a comment you must log in.
Revision history for this message
Christopher MacGown (0x44) wrote : Posted in a previous version of this proposal

LGTM, but you need to add yourself to AUTHORS.

review: Needs Fixing
Revision history for this message
Jason Kölker (jason-koelker) wrote : Posted in a previous version of this proposal

Is Bueno code wise.

IANAL, but I think your company needs to sign the Corporate CLA if it wishes to claim copyright on the contribution before it can hit trunk.

review: Needs Fixing
Revision history for this message
Thierry Carrez (ttx) wrote :

Also this can't land post-D4 -- please wait for Essex opening (September 8) before landing this.

review: Disapprove (ffe)
Reply
Revision history for this message
Jason Kölker (jason-koelker) :
review: Approve
Reply
Revision history for this message
Thierry Carrez (ttx) wrote :

Essex is open !

review: Abstain (ffe)
Reply
Revision history for this message
Matt Dietz (cerberus) wrote :

Implementation seems sensible

Few things:

103 + vdi_uuid = os.path.splitext(vdi_file)[0]
104 + new_path = os.path.join(staging_sr_path, vdi_file)

Weird indentation on 104

163 + if staging_sr_path == sr_path:
164 + staging_path = _make_staging_area(sr_path)
165 + else:
166 + staging_path = _make_staging_area(staging_sr_path)

Ditto

Looks like you're using tabs in place of spaces?

review: Needs Fixing
Reply

Unmerged revisions

1494. By USE Team

Removed Infospace Copyright

1493. By USE Team

Added myself to Authors file

1492. By USE Team

Cleaned up variable names

1491. By USE Team

Provide option to load Windows VHD into a shared storage LUN for a XenServer cluster.

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.