← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/virt/xenapi/pool.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/xenapi/pool.py
22
22
import json
23
23
import urlparse
24
24
 
 
25
from nova.compute import aggregate_states
25
26
from nova import db
26
27
from nova import exception
27
28
from nova import flags
28
29
from nova import log as logging
 
30
from nova.openstack.common import cfg
29
31
from nova import rpc
30
 
from nova.compute import aggregate_states
31
 
from nova.openstack.common import cfg
32
32
from nova.virt.xenapi import vm_utils
33
33
 
34
 
LOG = logging.getLogger("nova.virt.xenapi.pool")
 
34
LOG = logging.getLogger(__name__)
35
35
 
36
36
xenapi_pool_opts = [
37
37
    cfg.BoolOpt('use_join_force',