Switch to oslo.service

oslo.service has graduated, so heat should consume it.

Change-Id: I9c1899eb37505e64967e9cb77da23bb169498aba
Closes-Bug: #1466851

4 files changed, 6 insertions, 5 deletions

diff --git a/bin/heat-api b/bin/heat-api
index 227638fc0..8ac4ab73d 100755
--- a/bin/heat-api
+++ b/bin/heat-api
@@ -33,6 +33,7 @@ if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
 from oslo_config import cfg
 import oslo_i18n as i18n
 from oslo_log import log as logging
+from oslo_service import systemd
 import six
 
 from heat.common import config
@@ -40,7 +41,6 @@ from heat.common.i18n import _LI
 from heat.common import messaging
 from heat.common import profiler
 from heat.common import wsgi
-from heat.openstack.common import systemd
 from heat import version
 
 i18n.enable_lazy()
diff --git a/bin/heat-api-cfn b/bin/heat-api-cfn
index 61ced698d..7fb577d13 100755
--- a/bin/heat-api-cfn
+++ b/bin/heat-api-cfn
@@ -35,6 +35,7 @@ if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
 from oslo_config import cfg
 import oslo_i18n as i18n
 from oslo_log import log as logging
+from oslo_service import systemd
 import six
 
 from heat.common import config
@@ -42,7 +43,6 @@ from heat.common.i18n import _LI
 from heat.common import messaging
 from heat.common import profiler
 from heat.common import wsgi
-from heat.openstack.common import systemd
 from heat import version
 
 i18n.enable_lazy()
diff --git a/bin/heat-api-cloudwatch b/bin/heat-api-cloudwatch
index ebeed74f3..b7850214e 100755
--- a/bin/heat-api-cloudwatch
+++ b/bin/heat-api-cloudwatch
@@ -35,6 +35,7 @@ if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')):
 from oslo_config import cfg
 import oslo_i18n as i18n
 from oslo_log import log as logging
+from oslo_service import systemd
 import six
 
 from heat.common import config
@@ -42,7 +43,6 @@ from heat.common.i18n import _LI
 from heat.common import messaging
 from heat.common import profiler
 from heat.common import wsgi
-from heat.openstack.common import systemd
 from heat import version
 
 i18n.enable_lazy()
diff --git a/bin/heat-engine b/bin/heat-engine
index 5f43784c0..cf3b1c417 100755
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -35,13 +35,13 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'heat', '__init__.py')):
 from oslo_config import cfg
 import oslo_i18n as i18n
 from oslo_log import log as logging
+from oslo_service import service
 
 from heat.common import config
 from heat.common.i18n import _LC
 from heat.common import messaging
 from heat.common import profiler
 from heat.engine import template
-from heat.openstack.common import service
 from heat.rpc import api as rpc_api
 from heat import version
 
@@ -71,7 +71,8 @@ if __name__ == '__main__':
 
     profiler.setup('heat-engine', cfg.CONF.host)
     srv = engine.EngineService(cfg.CONF.host, rpc_api.ENGINE_TOPIC)
-    launcher = service.launch(srv, workers=cfg.CONF.num_engine_workers)
+    launcher = service.launch(cfg.CONF, srv,
+                              workers=cfg.CONF.num_engine_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