summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-10 23:31:06 +0000
committerGerrit Code Review <review@openstack.org>2013-06-10 23:31:06 +0000
commit2728c4ef7008e7b19149ae81e43fcad9554b795a (patch)
tree774633027b14a18b8ece7d3fb9a58b316773bdf9
parent5bfa143c56dc2c6fa79acc4417e80823336fc46a (diff)
parent57290516365e2d786c50b1e99ddbefa75997ad6d (diff)
Merge "Fix db.models.Service description"
-rw-r--r--nova/db/sqlalchemy/models.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index c4660226f..418e05cfa 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -45,10 +45,12 @@ class Service(BASE, NovaBase):
"""Represents a running service on a host."""
__tablename__ = 'services'
+ __table_args__ = ()
+
id = Column(Integer, primary_key=True)
- host = Column(String(255)) # , ForeignKey('hosts.id'))
- binary = Column(String(255))
- topic = Column(String(255))
+ host = Column(String(255), nullable=True) # , ForeignKey('hosts.id'))
+ binary = Column(String(255), nullable=True)
+ topic = Column(String(255), nullable=True)
report_count = Column(Integer, nullable=False, default=0)
disabled = Column(Boolean, default=False)