Merge "Make minimum default num_engine_workers>=4" into stable/liberty

2 files changed, 6 insertions, 4 deletions

diff --git a/heat/cmd/engine.py b/heat/cmd/engine.py
index 1574a5a60..bee78f589 100755
--- a/heat/cmd/engine.py
+++ b/heat/cmd/engine.py
@@ -23,6 +23,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
@@ -65,8 +66,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
diff --git a/heat/common/config.py b/heat/common/config.py
index b59815e9a..86c9f0e53 100644
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -18,7 +18,6 @@ import logging as sys_logging
 import os
 
 from eventlet.green import socket
-from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_log import log as logging
 
@@ -84,7 +83,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 = [