Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tls parameter to redis module #4207

Merged
merged 8 commits into from
Mar 11, 2022
Merged

Add tls parameter to redis module #4207

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3eb4b86
Add tls parameter to redis module
Feb 16, 2022
30bf371
Rename changelog fragment to match PR
Feb 16, 2022
7092e26
Apply suggestions from code review
jcharlytown Feb 17, 2022
56dfb5b
Port redis module to redis auth module util
Feb 21, 2022
0f3afb7
Update changelogs/fragments/4207-add-redis-tls-support.yml
jcharlytown Feb 23, 2022
036ffb7
Update plugins/modules/database/misc/redis.py
jcharlytown Feb 23, 2022
e205260
Undo reuse of redis auth doc fragment
Feb 23, 2022
205d93c
Use doc fragment.
felixfontein Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/4207-add-redis-tls-support.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- redis - add tls support to module
13 changes: 10 additions & 3 deletions plugins/modules/database/misc/redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
- The port to connect to
default: 6379
type: int
tls:
description:
- Specify whether or not to use TLS for the connection.
type: bool
default: false
master_host:
description:
- The host of the master instance [replica command]
Expand Down Expand Up @@ -181,6 +186,7 @@ def main():
login_password=dict(type='str', no_log=True),
login_host=dict(type='str', default='localhost'),
login_port=dict(type='int', default=6379),
tls=dict(type='bool', default=False),
master_host=dict(type='str'),
master_port=dict(type='int'),
replica_mode=dict(type='str', default='replica', choices=['master', 'replica', 'slave'], aliases=["slave_mode"]),
Expand All @@ -198,6 +204,7 @@ def main():
login_password = module.params['login_password']
login_host = module.params['login_host']
login_port = module.params['login_port']
ssl = module.params['tls']
command = module.params['command']
if command == "slave":
command = "replica"
Expand All @@ -219,7 +226,7 @@ def main():
module.fail_json(msg='In replica mode master port must be provided')

# Connect and check
r = redis.StrictRedis(host=login_host, port=login_port, password=login_password)
r = redis.StrictRedis(host=login_host, port=login_port, password=login_password, ssl=ssl)
try:
r.ping()
except Exception as e:
Expand Down Expand Up @@ -270,7 +277,7 @@ def main():
module.fail_json(msg="In db mode the db number must be provided")

# Connect and check
r = redis.StrictRedis(host=login_host, port=login_port, password=login_password, db=db)
r = redis.StrictRedis(host=login_host, port=login_port, password=login_password, ssl=ssl, db=db)
try:
r.ping()
except Exception as e:
Expand Down Expand Up @@ -301,7 +308,7 @@ def main():
except ValueError:
value = module.params['value']

r = redis.StrictRedis(host=login_host, port=login_port, password=login_password)
r = redis.StrictRedis(host=login_host, port=login_port, password=login_password, ssl=ssl)

try:
r.ping()
Expand Down