diff options
| author | Matt Riedemann <mriedem@us.ibm.com> | 2015-04-16 11:08:50 -0700 |
|---|---|---|
| committer | Matt Riedemann <mriedem@us.ibm.com> | 2015-04-16 14:10:38 -0700 |
| commit | 8ebd515aa94ed399074a3b55bd36fd8cd579a499 (patch) | |
| tree | 70432d980fcde7ff847a4ebb7cc6ba166920ae51 | |
| parent | 22d7547c6b62fb9dabd861e4941edd34eedabfc6 (diff) | |
| download | nova-8ebd515aa94ed399074a3b55bd36fd8cd579a499.tar.gz | |
Use kwargs from compute v4 proxy change_instance_metadata
The args were passed to the compute manager method in the wrong order.
We noticed this in the gate with KeyError: 'uuid' in the logs because of
the LOG.debug statement in change_instance_metadata. Just use kwargs
like rpcapi would normally.
There isn't a unit test for this since the v4 proxy code goes away in
liberty, this is for getting it into stable/kilo.
Closes-Bug: #1444728
Change-Id: Ic988f48d99e626ee5773c97904e09dbf00c5414a
(cherry picked from commit e55f746ea8590cce7c2b07a023197f369251a7ef)
| -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 aa56396613..0d007ae647 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -6580,7 +6580,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, destination, block_migration, disk_over_commit): |