Defualt services to enabled.

4 files changed, 12 insertions, 32 deletions

diff --git a/nova/db/api.py b/nova/db/api.py
index fcb1cc3f9..f32e1e3f5 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -29,7 +29,7 @@ The underlying driver is loaded as a :class:`LazyPluggable`.
                   `sqlite:///var/lib/nova/nova.sqlite`.
 
 :enable_new_services:  when adding a new service to the database, is it in the
-                       pool of available hardware (Default: False)
+                       pool of available hardware (Default: True)
 """
 
 from nova import exception
@@ -40,7 +40,7 @@ from nova import utils
 FLAGS = flags.FLAGS
 flags.DEFINE_string('db_backend', 'sqlalchemy',
                     'The backend to use for db')
-flags.DEFINE_boolean('enable_new_services', False,
+flags.DEFINE_boolean('enable_new_services', True,
                      'Services to be added to the available pool on create')
 
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index bcc076c5a..9f0597b54 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -236,8 +236,8 @@ def service_get_by_args(context, host, binary):
 def service_create(context, values):
     service_ref = models.Service()
     service_ref.update(values)
-    if FLAGS.enable_new_services:
-        service_ref.disabled = False
+    if not FLAGS.enable_new_services:
+        service_ref.disabled = True
     service_ref.save()
     return service_ref
 
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 86c24cb90..ca54d4466 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -148,7 +148,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=True)
+    disabled = Column(Boolean, default=False)
 
 
 class Certificate(BASE, NovaBase):
diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py
index 65430fb36..e8021ed5a 100644
--- a/nova/tests/test_scheduler.py
+++ b/nova/tests/test_scheduler.py
@@ -133,6 +133,10 @@ class SimpleDriverTestCase(test.TestCase):
                                    'compute',
                                    FLAGS.compute_manager)
         compute2.start()
+        s1 = db.service_get_by_args(self.context, 'host1', 'nova-compute')
+        s2 = db.service_get_by_args(self.context, 'host2', 'nova-compute')
+        db.service_update(self.context, s1['id'], {'disabled': True})
+        db.service_update(self.context, s2['id'], {'disabled': True})
         hosts = self.scheduler.driver.hosts_up(self.context, 'compute')
         self.assertEqual(0, len(hosts))
         compute1.kill()
@@ -152,10 +156,6 @@ class SimpleDriverTestCase(test.TestCase):
                                    'compute',
                                    FLAGS.compute_manager)
         compute2.start()
-        s1 = db.service_get_by_args(self.context, 'host1', 'nova-compute')
-        s2 = db.service_get_by_args(self.context, 'host2', 'nova-compute')
-        db.service_update(self.context, s1['id'], {'disabled': False})
-        db.service_update(self.context, s2['id'], {'disabled': False})
         hosts = self.scheduler.driver.hosts_up(self.context, 'compute')
         self.assertEqual(2, len(hosts))
         compute1.kill()
@@ -173,10 +173,6 @@ class SimpleDriverTestCase(test.TestCase):
                                    'compute',
                                    FLAGS.compute_manager)
         compute2.start()
-        s1 = db.service_get_by_args(self.context, 'host1', 'nova-compute')
-        s2 = db.service_get_by_args(self.context, 'host2', 'nova-compute')
-        db.service_update(self.context, s1['id'], {'disabled': False})
-        db.service_update(self.context, s2['id'], {'disabled': False})
         instance_id1 = self._create_instance()
         compute1.run_instance(self.context, instance_id1)
         instance_id2 = self._create_instance()
@@ -200,10 +196,6 @@ class SimpleDriverTestCase(test.TestCase):
                                    'compute',
                                    FLAGS.compute_manager)
         compute2.start()
-        s1 = db.service_get_by_args(self.context, 'host1', 'nova-compute')
-        s2 = db.service_get_by_args(self.context, 'host2', 'nova-compute')
-        db.service_update(self.context, s1['id'], {'disabled': False})
-        db.service_update(self.context, s2['id'], {'disabled': False})
         instance_id1 = self._create_instance()
         compute1.run_instance(self.context, instance_id1)
         instance_id2 = self._create_instance(availability_zone='nova:host1')
@@ -225,8 +217,7 @@ class SimpleDriverTestCase(test.TestCase):
         now = datetime.datetime.utcnow()
         delta = datetime.timedelta(seconds=FLAGS.service_down_time * 2)
         past = now - delta
-        db.service_update(self.context, s1['id'], {'disabled': False,
-                            'updated_at': past})
+        db.service_update(self.context, s1['id'], {'updated_at': past})
         instance_id2 = self._create_instance(availability_zone='nova:host1')
         self.assertRaises(driver.WillNotSchedule,
                           self.scheduler.driver.schedule_run_instance,
@@ -241,7 +232,8 @@ class SimpleDriverTestCase(test.TestCase):
                                    'compute',
                                    FLAGS.compute_manager)
         compute1.start()
-        db.service_get_by_args(self.context, 'host1', 'nova-compute')
+        s1 = db.service_get_by_args(self.context, 'host1', 'nova-compute')
+        db.service_update(self.context, s1['id'], {'disabled': True})
         instance_id2 = self._create_instance(availability_zone='nova:host1')
         host =  self.scheduler.driver.schedule_run_instance(self.context,
                                                             instance_id2)
@@ -261,10 +253,6 @@ class SimpleDriverTestCase(test.TestCase):
                                    'compute',
                                    FLAGS.compute_manager)
         compute2.start()
-        s1 = db.service_get_by_args(self.context, 'host1', 'nova-compute')
-        s2 = db.service_get_by_args(self.context, 'host2', 'nova-compute')
-        db.service_update(self.context, s1['id'], {'disabled': False})
-        db.service_update(self.context, s2['id'], {'disabled': False})
         instance_ids1 = []
         instance_ids2 = []
         for index in xrange(FLAGS.max_cores):
@@ -298,10 +286,6 @@ class SimpleDriverTestCase(test.TestCase):
                                    'volume',
                                    FLAGS.volume_manager)
         volume2.start()
-        s1 = db.service_get_by_args(self.context, 'host1', 'nova-volume')
-        s2 = db.service_get_by_args(self.context, 'host2', 'nova-volume')
-        db.service_update(self.context, s1['id'], {'disabled': False})
-        db.service_update(self.context, s2['id'], {'disabled': False})
         volume_id1 = self._create_volume()
         volume1.create_volume(self.context, volume_id1)
         volume_id2 = self._create_volume()
@@ -325,10 +309,6 @@ class SimpleDriverTestCase(test.TestCase):
                                    'volume',
                                    FLAGS.volume_manager)
         volume2.start()
-        s1 = db.service_get_by_args(self.context, 'host1', 'nova-volume')
-        s2 = db.service_get_by_args(self.context, 'host2', 'nova-volume')
-        db.service_update(self.context, s1['id'], {'disabled': False})
-        db.service_update(self.context, s2['id'], {'disabled': False})
         volume_ids1 = []
         volume_ids2 = []
         for index in xrange(FLAGS.max_gigabytes):