diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 01:01:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 01:01:57 +0000 |
| commit | fa4696ff03260351e0755191e479fcc8026ab828 (patch) | |
| tree | 4c5586992894a3a81fea1be4916073d5d5ce2fdc /nova/compute | |
| parent | e15b65f45673971480a66d17ccb771d7b7a46a30 (diff) | |
| parent | 37bfdd3b38b2d2c2f088f67e7bcc2f26c6e01c1c (diff) | |
Merge "fix N401 errors, stop ignoring all N4* errors"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 7 | ||||
| -rw-r--r-- | nova/compute/manager.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index abbc0bd92..f42891f89 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -313,9 +313,10 @@ class API(base.Base): raise exception.InvalidMetadataSize(reason=msg) def _check_requested_networks(self, context, requested_networks): - """ Check if the networks requested belongs to the project - and the fixed IP address for each network provided is within - same the network block + """ + Check if the networks requested belongs to the project + and the fixed IP address for each network provided is within + same the network block """ if not requested_networks: return diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b161f504c..f1a68345c 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2809,7 +2809,7 @@ class ComputeManager(manager.SchedulerDependentManager): instance_ref, dest) def rollback_live_migration_at_destination(self, context, instance): - """ Cleaning up image directory that is created pre_live_migration. + """Cleaning up image directory that is created pre_live_migration. :param context: security context :param instance: an Instance dict sent over rpc |