From e8b3e84c5f8b98edf6577c0d6e909edd801119b8 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Thu, 17 Sep 2020 11:04:23 +0300
Subject: [PATCH] Remove Riak result backend settings.

---
 celery/app/defaults.py           |  5 ---
 docs/userguide/configuration.rst | 74 --------------------------------
 2 files changed, 79 deletions(-)

diff --git a/celery/app/defaults.py b/celery/app/defaults.py
index 9d1b140ea2a..d0fa9d20b54 100644
--- a/celery/app/defaults.py
+++ b/celery/app/defaults.py
@@ -216,11 +216,6 @@ def __repr__(self):
         timeout=Option(type='float'),
         save_meta_as_text=Option(True, type='bool'),
     ),
-    riak=Namespace(
-        __old__=old_ns('celery_riak'),
-
-        backend_settings=Option(type='dict'),
-    ),
     security=Namespace(
         __old__=old_ns('celery_security'),
 
diff --git a/docs/userguide/configuration.rst b/docs/userguide/configuration.rst
index cfb413eb156..384be135b42 100644
--- a/docs/userguide/configuration.rst
+++ b/docs/userguide/configuration.rst
@@ -1583,80 +1583,6 @@ Default: :const:`True`
 Should meta saved as text or as native json.
 Result is always serialized as text.
 
-.. _conf-riak-result-backend:
-
-Riak backend settings
----------------------
-
-.. note::
-
-    The Riak backend requires the :pypi:`riak` library.
-
-    To install the this package use :command:`pip`:
-
-    .. code-block:: console
-
-        $ pip install celery[riak]
-
-    See :ref:`bundles` for information on combining multiple extension
-    requirements.
-
-This backend requires the :setting:`result_backend`
-setting to be set to a Riak URL::
-
-    result_backend = 'riak://host:port/bucket'
-
-For example::
-
-    result_backend = 'riak://localhost/celery
-
-is the same as::
-
-    result_backend = 'riak://'
-
-The fields of the URL are defined as follows:
-
-#. ``host``
-
-    Host name or IP address of the Riak server (e.g., `'localhost'`).
-
-#. ``port``
-
-    Port to the Riak server using the protobuf protocol. Default is 8087.
-
-#. ``bucket``
-
-    Bucket name to use. Default is `celery`.
-    The bucket needs to be a string with ASCII characters only.
-
-Alternatively, this backend can be configured with the following configuration directives.
-
-.. setting:: riak_backend_settings
-
-``riak_backend_settings``
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Default: ``{}`` (empty mapping).
-
-This is a dict supporting the following keys:
-
-* ``host``
-
-    The host name of the Riak server. Defaults to ``"localhost"``.
-
-* ``port``
-
-    The port the Riak server is listening to. Defaults to 8087.
-
-* ``bucket``
-
-    The bucket name to connect to. Defaults to "celery".
-
-* ``protocol``
-
-    The protocol to use to connect to the Riak server. This isn't configurable
-    via :setting:`result_backend`
-
 .. _conf-dynamodb-result-backend:
 
 AWS DynamoDB backend settings