summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-28 18:09:00 +0000
committerGerrit Code Review <review@openstack.org>2013-02-28 18:09:00 +0000
commit79cf4dc61fa85e36eb1913b3f9455d175bae7b38 (patch)
treedf9dbfbf9c843c8a1be6ea571cc68c94f0ec4385
parentd820da2428b47cdfa240802af14872b033710765 (diff)
parent8623242b319b23950ab2446deb5d5baef5da03da (diff)
downloadnova-79cf4dc61fa85e36eb1913b3f9455d175bae7b38.tar.gz
nova-79cf4dc61fa85e36eb1913b3f9455d175bae7b38.tar.xz
nova-79cf4dc61fa85e36eb1913b3f9455d175bae7b38.zip
Merge "Remove old commented out code in sqlalchemy models"
-rw-r--r--nova/db/sqlalchemy/models.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 95456bf98..3ad0db116 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -164,12 +164,6 @@ class Instance(BASE, NovaBase):
ramdisk_id = Column(String(255))
hostname = Column(String(255))
-# image_ref = Column(Integer, ForeignKey('images.id'), nullable=True)
-# kernel_id = Column(Integer, ForeignKey('images.id'), nullable=True)
-# ramdisk_id = Column(Integer, ForeignKey('images.id'), nullable=True)
-# ramdisk = relationship(Ramdisk, backref=backref('instances', order_by=id))
-# kernel = relationship(Kernel, backref=backref('instances', order_by=id))
-
launch_index = Column(Integer)
key_name = Column(String(255))
key_data = Column(Text)