diff --git a/mistral/config.py b/mistral/config.py
index 8ee3d2632..33210e685 100644
--- a/mistral/config.py
+++ b/mistral/config.py
@@ -169,8 +169,10 @@ rpc_response_timeout_opt = cfg.IntOpt(
 
 oslo_rpc_executor = cfg.StrOpt(
     'oslo_rpc_executor',
-    default='eventlet',
-    choices=['eventlet', 'blocking', 'threading'],
+    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.')
 )
diff --git a/mistral/releasenotes/notes/deprecate-oslo_rpc_executor-eventlet-8ca1cc8a71de59c4.yaml b/mistral/releasenotes/notes/deprecate-oslo_rpc_executor-eventlet-8ca1cc8a71de59c4.yaml
new file mode 100644
index 000000000..937143834
--- /dev/null
+++ b/mistral/releasenotes/notes/deprecate-oslo_rpc_executor-eventlet-8ca1cc8a71de59c4.yaml
@@ -0,0 +1,7 @@
+---
+deprecations:
+  - |
+    The parameter `oslo_rpc_executor` is now deprecated and its default value
+    has been set to `threading` instead of `eventlet`.
+    This change has been done during the process of eventlet removal, see
+    `Eventlet Removal <https://wiki.openstack.org/wiki/Eventlet-removal>`_