diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-10-25 12:54:22 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-10-25 12:54:22 -0700 |
| commit | 60f3b009f3f846539dfeb2101eec73259553f8ea (patch) | |
| tree | e2b7f3375ea7902b06c8543e92c902d1c8b00fcd | |
| parent | 2738a380816b73f35e73f111bd9b4f3ef3101012 (diff) | |
| download | nova-60f3b009f3f846539dfeb2101eec73259553f8ea.tar.gz nova-60f3b009f3f846539dfeb2101eec73259553f8ea.tar.xz nova-60f3b009f3f846539dfeb2101eec73259553f8ea.zip | |
pep8 cleanup
| -rw-r--r-- | nova/compute/manager.py | 4 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 1 | ||||
| -rw-r--r-- | nova/volume/manager.py | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 80931a309..f2e80bff3 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -194,8 +194,8 @@ class ComputeManager(manager.Manager): instance_ref = self.db.instance_get(context, instance_id) volume_ref = self.db.volume_get(context, volume_id) if instance_ref['name'] not in self.driver.list_instances(): - logging.warn("Detaching volume from instance %s that isn't running", - instance_ref['name']) + logging.warn("Detaching volume from unknown instance %s", + instance_ref['name']) else: yield self.driver.detach_volume(instance_ref['name'], volume_ref['mountpoint']) diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index b0adc3a2a..f0424cc64 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -266,7 +266,6 @@ class Volume(BASE, NovaBase): return self.ec2_id - class Quota(BASE, NovaBase): """Represents quota overrides for a project""" __tablename__ = 'quotas' diff --git a/nova/volume/manager.py b/nova/volume/manager.py index bc49e28ee..ee1c019ad 100644 --- a/nova/volume/manager.py +++ b/nova/volume/manager.py @@ -133,4 +133,3 @@ class VolumeManager(manager.Manager): defer.returnValue(True) else: yield self.driver.undiscover_volume(volume_ref) - |