← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/virt/libvirt/utils.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, James Page
  • Date: 2013-03-20 12:59:22 UTC
  • mfrom: (1.1.69)
  • Revision ID: package-import@ubuntu.com-20130320125922-ohvfav96lemn9wlz
Tags: 1:2013.1~rc1-0ubuntu1
[ Chuck Short ]
* New upstream release.
* debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
* debian/control: Clean up dependencies:
  - Dropped python-gflags no longer needed.
  - Dropped python-daemon no longer needed.
  - Dropped python-glance no longer needed.
  - Dropped python-lockfile no longer needed.
  - Dropped python-simplejson no longer needed.
  - Dropped python-tempita no longer needed.
  - Dropped python-xattr no longer needed.
  - Add sqlite3 required for the testsuite.

[ James Page ]
* d/watch: Update uversionmangle to deal with upstream versioning
  changes, remove tarballs.openstack.org. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/libvirt/utils.py
5
5
#    All Rights Reserved.
6
6
#    Copyright (c) 2010 Citrix Systems, Inc.
7
7
#    Copyright (c) 2011 Piston Cloud Computing, Inc
8
 
#    Copyright (c) 2011 OpenStack LLC
 
8
#    Copyright (c) 2011 OpenStack Foundation
9
9
#    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
10
10
#
11
11
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
455
455
    :param disk_path: Path to disk image
456
456
    :param snapshot_name: Name of snapshot in disk image
457
457
    """
458
 
    qemu_img_cmd = ('qemu-img',
459
 
                    'snapshot',
460
 
                    '-c',
461
 
                    snapshot_name,
462
 
                    disk_path)
 
458
    qemu_img_cmd = ('qemu-img', 'snapshot', '-c', snapshot_name, disk_path)
463
459
    # NOTE(vish): libvirt changes ownership of images
464
460
    execute(*qemu_img_cmd, run_as_root=True)
465
461
 
470
466
    :param disk_path: Path to disk image
471
467
    :param snapshot_name: Name of snapshot in disk image
472
468
    """
473
 
    qemu_img_cmd = ('qemu-img',
474
 
                    'snapshot',
475
 
                    '-d',
476
 
                    snapshot_name,
477
 
                    disk_path)
 
469
    qemu_img_cmd = ('qemu-img', 'snapshot', '-d', snapshot_name, disk_path)
478
470
    # NOTE(vish): libvirt changes ownership of images
479
471
    execute(*qemu_img_cmd, run_as_root=True)
480
472