add disabled column to services and check for it in scheduler

2 files changed, 4 insertions, 1 deletions

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 2b0dd6ea6..2ecf21685 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -61,6 +61,7 @@ def service_get_all_by_topic(context, topic):
     session = get_session()
     return session.query(models.Service
                  ).filter_by(deleted=False
+                 ).filter_by(disabled=False
                  ).filter_by(topic=topic
                  ).all()
 
@@ -70,6 +71,7 @@ def _service_get_all_topic_subquery(_context, session, topic, subq, label):
     return session.query(models.Service, func.coalesce(sort_value, 0)
                  ).filter_by(topic=topic
                  ).filter_by(deleted=False
+                 ).filter_by(disabled=False
                  ).outerjoin((subq, models.Service.host == subq.c.host)
                  ).order_by(sort_value
                  ).all()
@@ -699,7 +701,7 @@ def auth_create_token(_context, token):
         tk[k] = v
     tk.save()
     return tk
-    
+
 
 ###################
 
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index f6ba7953f..021091b60 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -173,6 +173,7 @@ class Service(BASE, NovaBase):
     binary = Column(String(255))
     topic = Column(String(255))
     report_count = Column(Integer, nullable=False, default=0)
+    disabled = Column(Boolean, default=False)
 
     @classmethod
     def find_by_args(cls, host, binary, session=None, deleted=False):