diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-21 11:17:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-21 11:17:50 +0000 |
| commit | 5a99238c6d2dab4d57578d53eb0e16609098203b (patch) | |
| tree | f0abdd1d0ae83b8b38298bb89f2dee8ca28ad626 | |
| parent | bd045581db42adae4bf7ac3702d53dd02ffc8ec0 (diff) | |
| parent | 8ebd515aa94ed399074a3b55bd36fd8cd579a499 (diff) | |
| download | nova-5a99238c6d2dab4d57578d53eb0e16609098203b.tar.gz | |
Merge "Use kwargs from compute v4 proxy change_instance_metadata" into stable/kilo
| -rw-r--r-- | nova/compute/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 4c694a6a8c..5be25d4f13 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -6581,7 +6581,8 @@ class _ComputeV4Proxy(object): bdm=bdm) def change_instance_metadata(self, ctxt, instance, diff): - return self.manager.change_instance_metadata(ctxt, instance, diff) + return self.manager.change_instance_metadata( + ctxt, diff=diff, instance=instance) def check_can_live_migrate_destination(self, ctxt, instance, block_migration, disk_over_commit): |