diff options
| author | Brian Elliott <brian.elliott@rackspace.com> | 2012-11-27 16:49:58 +0000 |
|---|---|---|
| committer | Brian Elliott <brian.elliott@rackspace.com> | 2012-11-27 22:51:25 +0000 |
| commit | 8a3c7d30914c7cd1f85583316980ece3c33ed3d1 (patch) | |
| tree | 27f82d1df68b545fc9348a26bee6eb53ed4e02a6 /nova/conductor | |
| parent | edd52974e2cdfc96088617ac19d860f55fcb6209 (diff) | |
| download | nova-8a3c7d30914c7cd1f85583316980ece3c33ed3d1.tar.gz nova-8a3c7d30914c7cd1f85583316980ece3c33ed3d1.tar.xz nova-8a3c7d30914c7cd1f85583316980ece3c33ed3d1.zip | |
Make resize and multi-node work properly together
Added node support to migrations and update node properly in
'resize_instance'.
bug 1081355
Change-Id: I003d34e3f7ed9ce2feda19ee5ce210ed4ba7eaa1
Diffstat (limited to 'nova/conductor')
| -rw-r--r-- | nova/conductor/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py index 6270fb241..4cb6672f4 100644 --- a/nova/conductor/manager.py +++ b/nova/conductor/manager.py @@ -24,7 +24,7 @@ LOG = logging.getLogger(__name__) allowed_updates = ['task_state', 'vm_state', 'expected_task_state', 'power_state', 'access_ip_v4', 'access_ip_v6', - 'launched_at', 'terminated_at', 'host', + 'launched_at', 'terminated_at', 'host', 'node', 'memory_mb', 'vcpus', 'root_gb', 'ephemeral_gb', 'instance_type_id', 'root_device_name', 'host', 'progress', 'vm_mode', 'default_ephemeral_device', |