wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gitlab_user: Fix ssh key add and group membership add when there's other changes (#63621) (#63634)

Browse source 
* Fixed syntax in sshkey/group add

* Added changelog

* pep8 fix

(cherry picked from commit b4bb3dee9a)
This commit is contained in:
Andrea Tartaglia 2019-11-12 21:01:53 +00:00 committed by Matt Davis
parent 20735f6b5b
commit 50bbd72694
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/63621-gitlab_user-fix-sshkey-and-user.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "gitlab_user - Fix adding ssh key to new/changed user and adding group membership for new/changed user"

6
lib/ansible/modules/source_control/gitlab_user.py
View file

@ -233,13 +233,15 @@ class GitLabUser(object):
# Assign ssh keys
if options['sshkey_name'] and options['sshkey_file']:
changed = changed or self.addSshKeyToUser(user, {
key_changed = self.addSshKeyToUser(user, {
'name': options['sshkey_name'],
'file': options['sshkey_file']})
changed = changed or key_changed
# Assign group
if options['group_path']:
changed = changed or self.assignUserToGroup(user, options['group_path'], options['access_level'])
group_changed = self.assignUserToGroup(user, options['group_path'], options['access_level'])
changed = changed or group_changed
self.userObject = user
if changed: