[stable-2] Backport from main to stable-2 (#287)

* Update CONTRIBUTORS file (#278) (cherry picked from commit cbdf512) * Honor the set_default_role_all parameter (#282) The set_default_role_all parameter is documented, but does nothing. This PR fixes this. (cherry picked from commit f547b66) * Add a changelog fragment to PR 282 (#283) (cherry picked from commit 952e166) Co-authored-by: Benoit Garret <[email protected]>
ansible-collections · Feb 16, 2022 · 8b2c418 · 8b2c418
1 parent 9d9ea46
commit 8b2c418
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -36,6 +36,7 @@ Berbe
 bjne
 bmalynovytch
 bmildren
+bmillemathias
 boreal321
 brutus
 burner1024
@@ -60,6 +61,7 @@ Davidffry
 denisemauldin
 diclophis
 d-lee
+d-rupp
 dmp1ce
 dnelson
 dramaley
@@ -100,6 +102,7 @@ hyperfocus1338
 igormukhingmailcom
 imjoseangel
 infigoKriti
+int32bit
 ipergenitsa
 iredmail
 ivandigiusto
@@ -109,6 +112,7 @@ jamescassell
 janosmiko
 jarnold-timeout
 JaSafieddine
+jb-2197
 jborean93
 jctanner
 jean-christophe-manciot
@@ -136,10 +140,12 @@ kalaisubbiah
 kenichi-ogawa-1988
 kkeane
 klingac
+koleo
 kotso
 kuntalFreshBooks
 kurtdavis
 larsks
+laurent-indermuehle
 ldesgrange
 leeadh
 LeonB
@@ -218,6 +224,7 @@ robpblake
 rokka-n
 Roxyrob
 roysmith
+rsicart
 rthouvenin
 ruudk
 samccann
@@ -242,6 +249,7 @@ stoned
 strixBE
 SWADESNA
 tapologo
+tarunm97
 tejatsk14
 tersmitten
 the
@@ -252,6 +260,7 @@ timorunge
 Tomasthanes
 tomdymond
 Tronde
+tuhoanganh
 tvlooy
 tyll
 UncertaintyP

diff --git a/changelogs/fragments/282-mysql_role_fix_set_default_role_all_argument.yml b/changelogs/fragments/282-mysql_role_fix_set_default_role_all_argument.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- mysql_role - make the ``set_default_role_all`` parameter actually working (https://github.com/ansible-collections/community.mysql/pull/282).
diff --git a/plugins/modules/mysql_role.py b/plugins/modules/mysql_role.py
@@ -770,7 +770,8 @@ def update_members(self, users, check_mode=False, append_members=False,
 
                 self.cursor.execute(*self.q_builder.role_grant(user))
 
-                self.role_impl.set_default_role_all(user)
+                if set_default_role_all:
+                    self.role_impl.set_default_role_all(user)
 
                 changed = True
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- mysql_role - make the ``set_default_role_all`` parameter actually working (https://github.com/ansible-collections/community.mysql/pull/282).