Get rid of oslo_rpc_executor option

The only valid option for engine rpc executor is now threading.

Change-Id: I722b9f1ff091bef7df282afadd15cd3b3872d040
Signed-off-by: Arnaud M <arnaud.morin@gmail.com>
Co-Authored-By: Hervé Beraud <hberaud@redhat.com>

.zuul.yaml

@@ -9,8 +9,6 @@
         post-config:
           $MISTRAL_CONF_FILE:
             default:
-              oslo_rpc_executor: threading
-              rpc_message_ttl: 3000
               rpc_response_timeout: 3000
               default_log_levels: mistral=DEBUG,mistral.expressions=INFO,sqlalchemy=INFO
             engine:

mistral/config.py

@@ -190,16 +190,6 @@ js_impl_opt = cfg.StrOpt(
            'action to evaluate scripts.')
 )
 
-oslo_rpc_executor = cfg.StrOpt(
-    'oslo_rpc_executor',
-    default='threading',
-    choices=['eventlet', 'threading'],
-    deprecated_for_removal=True,
-    deprecated_reason='This option is going to be removed from oslo.messaging',
-    help=_('Executor type used by Oslo Messaging framework. Defines how '
-           'Oslo Messaging based RPC subsystem processes incoming calls.')
-)
-
 expiration_token_duration = cfg.IntOpt(
     'expiration_token_duration',
     default=30,
@@ -791,7 +781,6 @@ CONF.register_opt(wf_trace_log_name_opt)
 CONF.register_opt(auth_type_opt)
 CONF.register_opt(scheduler_type_opt)
 CONF.register_opt(js_impl_opt)
-CONF.register_opt(oslo_rpc_executor)
 CONF.register_opt(expiration_token_duration)
 
 CONF.register_opts(action_providers_opts, group=ACTION_PROVIDERS_GROUP)
@@ -832,7 +821,6 @@ default_group_opts = CLI_OPTS + [
     auth_type_opt,
     scheduler_type_opt,
     js_impl_opt,
-    oslo_rpc_executor,
     expiration_token_duration
 ]
 

mistral/engine/engine_server.py

@@ -87,7 +87,7 @@ class EngineServer(service_base.MistralService):
         self._rpc_server = rpc.get_rpc_server_driver()(CONF.engine)
         self._rpc_server.register_endpoint(self)
 
-        self._rpc_server.run(executor=CONF.oslo_rpc_executor)
+        self._rpc_server.run(executor='threading')
 
         self._notify_started('Engine server started.')
 

releasenotes/notes/oslo-rpc-executor-deletion-c8e38a7c74478d96.yaml

@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The ``oslo_rpc_executor`` option is removed.
+    If you were explicitly setting ``oslo_rpc_executor = threading`` in your
+    configuration, you can safely remove this setting as threading is now the
+    only supported executor type.