summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntony Messerli <amesserl@rackspace.com>2011-09-12 20:19:48 +0000
committerTarmac <>2011-09-12 20:19:48 +0000
commit68551bb375588470b41606f181c445192c18cdaa (patch)
treea3011c9bb73797a8e02a8ab5ec4a060da2e713fa
parent9df16b1aca4c17f60e145aa18531266880b95632 (diff)
parent81fe8c89061fa15ebcea9d20f39cf79b63cf8522 (diff)
downloadnova-68551bb375588470b41606f181c445192c18cdaa.tar.gz
nova-68551bb375588470b41606f181c445192c18cdaa.tar.xz
nova-68551bb375588470b41606f181c445192c18cdaa.zip
pep8 fixes in nova/db/sqlalchemy/api.py and nova/virt/disk.py
-rw-r--r--nova/db/sqlalchemy/api.py2
-rw-r--r--nova/virt/disk.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 40e2ca167..e5a661c7f 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -672,7 +672,7 @@ def floating_ip_update(context, address, values):
def fixed_ip_associate(context, address, instance_id, network_id=None,
reserved=False):
"""Keyword arguments:
- reserved -- should be a boolean value(True or False), exact value will be
+ reserved -- should be a boolean value(True or False), exact value will be
used to filter on the fixed ip address
"""
session = get_session()
diff --git a/nova/virt/disk.py b/nova/virt/disk.py
index d0745c82d..cd3422829 100644
--- a/nova/virt/disk.py
+++ b/nova/virt/disk.py
@@ -160,6 +160,7 @@ def destroy_container(target, instance, nbd=False):
except Exception, exn:
LOG.exception(_('Failed to remove container: %s'), exn)
+
def _link_device(image, nbd):
"""Link image to device using loopback or nbd"""