diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-14 17:52:49 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-14 17:52:49 -0500 |
| commit | 9ef64c8ccbcdacfef642b2c203ffcc45b2deaf36 (patch) | |
| tree | d799f5aad0d380582dbc102d2c5eef05573c8a75 /nova/db | |
| parent | d9d0b416d75cc1c1a4ab03d88cdc8079240566ff (diff) | |
| download | nova-9ef64c8ccbcdacfef642b2c203ffcc45b2deaf36.tar.gz nova-9ef64c8ccbcdacfef642b2c203ffcc45b2deaf36.tar.xz nova-9ef64c8ccbcdacfef642b2c203ffcc45b2deaf36.zip | |
fixed instance[fixed_ip] in ec2 api, removed fixed_ip shim
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 9455ed95a..e9689774c 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -187,9 +187,9 @@ class Instance(BASE, NovaBase): #TODO{tr3buchet): i don't like this shim..... # prevents breaking ec2 api # should go away with zones when ec2 api doesn't have compute db access - @property - def fixed_ip(self): - return self.fixed_ips[0] if self.fixed_ips else None + #@property + #def fixed_ip(self): + # return self.fixed_ips[0] if self.fixed_ips else None image_ref = Column(String(255)) kernel_id = Column(String(255)) |