From 13996cea60a56ceb9b1383cf1891819e280efacc Mon Sep 17 00:00:00 2001
From: Marno van der Molen <marnovandermolen@acknowledge.nl>
Date: Fri, 25 May 2018 14:39:49 +0200
Subject: [PATCH] Add password support to Redis returner

---
 salt/returners/redis_return.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/salt/returners/redis_return.py b/salt/returners/redis_return.py
index 8a821630b70..061dc573dbf 100644
--- a/salt/returners/redis_return.py
+++ b/salt/returners/redis_return.py
@@ -10,6 +10,7 @@ config, these are the defaults:
     redis.db: '0'
     redis.host: 'salt'
     redis.port: 6379
+    redis.password: ''
 
 .. versionadded:: 2018.3.1
 
@@ -42,6 +43,7 @@ the default location:
     alternative.redis.db: '0'
     alternative.redis.host: 'salt'
     alternative.redis.port: 6379
+    alternative.redis.password: ''
 
 To use the redis returner, append '--return redis' to the salt command.
 
@@ -152,6 +154,7 @@ def _get_options(ret=None):
         "port": "port",
         "unix_socket_path": "unix_socket_path",
         "db": "db",
+        "password": "password",
         "cluster_mode": "cluster_mode",
         "startup_nodes": "cluster.startup_nodes",
         "skip_full_coverage_check": "cluster.skip_full_coverage_check",
@@ -163,6 +166,7 @@ def _get_options(ret=None):
             "port": __opts__.get("redis.port", 6379),
             "unix_socket_path": __opts__.get("redis.unix_socket_path", None),
             "db": __opts__.get("redis.db", "0"),
+            "password": __opts__.get("redis.password", ""),
             "cluster_mode": __opts__.get("redis.cluster_mode", False),
             "startup_nodes": __opts__.get("redis.cluster.startup_nodes", {}),
             "skip_full_coverage_check": __opts__.get(
@@ -196,6 +200,7 @@ def _get_serv(ret=None):
             port=_options.get("port"),
             unix_socket_path=_options.get("unix_socket_path", None),
             db=_options.get("db"),
+            password=_options.get("password"),
             decode_responses=True,
         )
     return REDIS_POOL