diff options
| author | masumotok <masumotok@nttdata.co.jp> | 2010-12-27 17:49:07 +0900 |
|---|---|---|
| committer | masumotok <masumotok@nttdata.co.jp> | 2010-12-27 17:49:07 +0900 |
| commit | 85acbbe916df8b2d18f0dc3a0b8cad9fcfdd6907 (patch) | |
| tree | 20aeff3a90bd64cb85834a2e8d5d173933b172d7 | |
| parent | d7a790440b4beced21ee4986448e75d83415ec0e (diff) | |
launch_at を前回コミット時に追加したが、lauched_atというカラムが既に存在し、
紛らわしいのでlauched_onにした。
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 4 | ||||
| -rw-r--r-- | nova/scheduler/manager.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 3e468b3a4..66bbb8d5a 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -105,7 +105,7 @@ class ComputeManager(manager.Manager): self.network_manager.setup_compute_network(context, instance_id) self.db.instance_update(context, instance_id, - {'host': self.host, 'launch_at':self.host}) + {'host': self.host, 'launched_on':self.host}) # TODO(vish) check to make sure the availability zone matches self.db.instance_set_state(context, diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 7f3a58bcb..c3e566c6a 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -234,9 +234,9 @@ class Instance(BASE, NovaBase): display_name = Column(String(255)) display_description = Column(String(255)) - # To remember at which host a instance booted. + # To remember on which host a instance booted. # An instance may moved to other host by live migraiton. - launch_at = Column(String(255)) + launched_on = Column(String(255)) # TODO(vish): see Ewan's email about state improvements, probably # should be in a driver base class or some such diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index 0921e3791..fe3ca9d5e 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -82,7 +82,7 @@ class SchedulerManager(manager.Manager): instance_id = instance_ref['id'] # 2. get src host and dst host - src = instance_ref['launch_at'] + src = instance_ref['launched_on'] shost_ref = db.host_get_by_name(context, src ) dhost_ref = db.host_get_by_name(context, dest) |