Merge "Make minimum default num_engine_workers>=4"

heat/cmd/engine.py

@@ -24,6 +24,7 @@ eventlet.monkey_patch()
 
 import sys
 
+from oslo_concurrency import processutils
 from oslo_config import cfg
 import oslo_i18n as i18n
 from oslo_log import log as logging
@@ -66,8 +67,11 @@ def main():
     profiler.setup('heat-engine', cfg.CONF.host)
     gmr.TextGuruMeditation.setup_autorun(version)
     srv = engine.EngineService(cfg.CONF.host, rpc_api.ENGINE_TOPIC)
-    launcher = service.launch(cfg.CONF, srv,
-                              workers=cfg.CONF.num_engine_workers)
+    workers = cfg.CONF.num_engine_workers
+    if not workers:
+        workers = max(4, processutils.get_worker_count())
+
+    launcher = service.launch(cfg.CONF, srv, workers=workers)
     if cfg.CONF.enable_cloud_watch_lite:
         # We create the periodic tasks here, which mean they are created
         # only in the parent process when num_engine_workers>1 is specified

heat/common/config.py

@@ -15,7 +15,6 @@
 import os
 
 from eventlet.green import socket
-from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_log import log as logging
 
@@ -81,7 +80,6 @@ service_opts = [
                default=5,
                help=_('Maximum depth allowed when using nested stacks.')),
     cfg.IntOpt('num_engine_workers',
-               default=processutils.get_worker_count(),
                help=_('Number of heat-engine processes to fork and run.'))]
 
 engine_opts = [

heat_integrationtests/pre_test_hook.sh

@@ -27,7 +27,6 @@ if [ "$ENABLE_CONVERGENCE" == "true" ] ; then
 fi
 
 echo -e 'notification_driver=messagingv2\n' >> $localconf
-echo -e 'num_engine_workers=4\n' >> $localconf
 echo -e 'hidden_stack_tags=hidden\n' >> $localconf
 echo -e 'encrypt_parameters_and_properties=True\n' >> $localconf