Switch to oslo.service

oslo.service has graduated, so trove should consume it.
Remove a "ticks_between_runs" parameter from the periodic tasks.
All periodic_tasks will be executed with the same interval with the value of
the "report_interval" option.
According to the old default value of the "report_interval" option and
the value of the ticks_between_runs paramentr (3), increase
the "report_interval" option to the 30 seconds.
Rename the "exists_notification_ticks" option to the "exists_notification_interval"
and increase the default value of it to 3600, according to the old value of
the "report_interval" option.

DocImpact
The option name and default value of exists_notification_ticks was changed to
exists_notification_interval with 3600 sec. And the new default value of
the report_interval option is 30 sec. The deployers need to make sure that
the new values in the seconds, not in the ticks.

Change-Id: Id14d28146f677faf017160ac93289fd119674fc4
Depends-On: Ia5b887e69853f39b387d309831fb7ce51b881149
Closes-Bug: #1466851

3 files changed, 8 insertions, 6 deletions

diff --git a/trove/cmd/conductor.py b/trove/cmd/conductor.py
index c398e860..62fd7689 100755
--- a/trove/cmd/conductor.py
+++ b/trove/cmd/conductor.py
@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from oslo_concurrency import processutils
+from oslo_service import service as openstack_service
+
 from trove.cmd.common import with_initialize
 
 
@@ -20,12 +22,11 @@ from trove.cmd.common import with_initialize
 def main(conf):
     from trove.common.rpc import service as rpc_service
     from trove.common.rpc import version as rpc_version
-    from trove.openstack.common import service as openstack_service
 
     topic = conf.conductor_queue
     server = rpc_service.RpcService(
         manager=conf.conductor_manager, topic=topic,
         rpc_api_version=rpc_version.RPC_API_VERSION)
     workers = conf.trove_conductor_workers or processutils.get_worker_count()
-    launcher = openstack_service.launch(server, workers=workers)
+    launcher = openstack_service.launch(conf, server, workers=workers)
     launcher.wait()
diff --git a/trove/cmd/guest.py b/trove/cmd/guest.py
index efa8f91f..b401daf6 100755
--- a/trove/cmd/guest.py
+++ b/trove/cmd/guest.py
@@ -25,11 +25,11 @@ gettext.install('trove', unicode=1)
 import sys
 
 from oslo_config import cfg as openstack_cfg
+from oslo_service import service as openstack_service
 
 from trove.common import cfg
 from trove.common import debug_utils
 from trove.openstack.common import log as logging
-from trove.openstack.common import service as openstack_service
 
 CONF = cfg.CONF
 # The guest_id opt definition must match the one in common/cfg.py
@@ -66,5 +66,5 @@ def main():
         manager=manager, host=CONF.guest_id,
         rpc_api_version=rpc_version.RPC_API_VERSION)
 
-    launcher = openstack_service.launch(server)
+    launcher = openstack_service.launch(CONF, server)
     launcher.wait()
diff --git a/trove/cmd/taskmanager.py b/trove/cmd/taskmanager.py
index 9413307e..3aa4ef97 100755
--- a/trove/cmd/taskmanager.py
+++ b/trove/cmd/taskmanager.py
@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from oslo_config import cfg as openstack_cfg
+from oslo_service import service as openstack_service
+
 from trove.cmd.common import with_initialize
 
 
@@ -22,12 +24,11 @@ extra_opts = [openstack_cfg.StrOpt('taskmanager_manager')]
 def startup(conf, topic):
     from trove.common.rpc import service as rpc_service
     from trove.common.rpc import version as rpc_version
-    from trove.openstack.common import service as openstack_service
 
     server = rpc_service.RpcService(
         manager=conf.taskmanager_manager, topic=topic,
         rpc_api_version=rpc_version.RPC_API_VERSION)
-    launcher = openstack_service.launch(server)
+    launcher = openstack_service.launch(conf, server)
     launcher.wait()