cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Backport/2.7/49084 (#49973)

Browse source 
* influxdb_user: Fixed default password behavior (#47040)

(cherry picked from commit 1eed8900ed)

* Amends #47040 - influxdb_user - Prevents potential accidental password changes to blank (#49084)

* Amends #47040 - Prevents potential accidental password changes to blank

* Added changelog fragment

(cherry picked from commit b422c59ada)
This commit is contained in:
Michael Rose 2019-01-07 09:25:36 -08:00 committed by Toshio Kuratomi
parent a9fd20318c
commit 898ec291b0
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/49084-influxdb_user-default-password-fix.yaml Normal file
View file

@ -0,0 +1,3 @@
---
bugfixes:
- influxdb_user - An unspecified password now sets the password to blank, except on existing users. This previously caused an unhandled exception.

3
lib/ansible/modules/database/influxdb/influxdb_user.py
View file

@ -166,11 +166,12 @@ def main():
if state == 'present': if state == 'present':
if user: if user:
if check_user_password(module, client, user_name, user_password): if user_password is None or check_user_password(module, client, user_name, user_password):
module.exit_json(changed=False) module.exit_json(changed=False)
else: else:
set_user_password(module, client, user_name, user_password) set_user_password(module, client, user_name, user_password)
else: else:
user_password = user_password or ''
create_user(module, client, user_name, user_password, admin) create_user(module, client, user_name, user_password, admin)
if state == 'absent': if state == 'absent':