← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/virt/baremetal/nodes.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/baremetal/nodes.py
15
15
#    under the License.
16
16
#
17
17
 
 
18
from nova import exception
 
19
from nova import flags
 
20
from nova.openstack.common import cfg
 
21
from nova.virt.baremetal import fake
18
22
from nova.virt.baremetal import tilera
19
 
from nova.virt.baremetal import fake
20
 
from nova.openstack.common import cfg
21
 
from nova import flags
22
 
from nova import exception
23
23
 
24
24
FLAGS = flags.FLAGS
25
25
 
39
39
    elif d == 'fake':
40
40
        return fake.get_baremetal_nodes()
41
41
    else:
42
 
        raise exception.Error(_("Unknown baremetal driver %(d)s"))
 
42
        raise exception.NovaException(_("Unknown baremetal driver %(d)s"))