mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
ipa_sudorule, ipa_hbacrule: change ipaenabledflag type to bool (#7880)
* ipa_sudorule, ipa_hbacrule: change ipaenabledflag type to bool freeipa changed the type to bool with commit https://pagure.io/freeipa/c/6c5f2bcb301187f9844985ffe309c7d2262e16f3 * add changelog-fragment * ipa_sudorule, ipa_hbacrule: set ipaenabledflag according to version * ipa_sudorule, ipa_hbacrule: change version for backport it also got backported (https://pagure.io/freeipa/c/faeb656c77adf27a49ccaceb57fc1ba44e11cc1d) * ipa_sudorule, ipa_hbacrule: swap assigned values * Update changelogs/fragments/7880-ipa-fix-sudo-and-hbcalrule-idempotence.yml Co-authored-by: Felix Fontein <felix@fontein.de> --------- Co-authored-by: aBUDmdBQ <> Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
23396e62dc
commit
9f5193e40b
3 changed files with 23 additions and 4 deletions
|
@ -0,0 +1,3 @@
|
||||||
|
bugfixes:
|
||||||
|
- ipa_sudorule - the module uses a string for ``ipaenabledflag`` for new FreeIPA versions while the returned value is a boolean (https://github.com/ansible-collections/community.general/pull/7880).
|
||||||
|
- ipa_hbacrule - the module uses a string for ``ipaenabledflag`` for new FreeIPA versions while the returned value is a boolean (https://github.com/ansible-collections/community.general/pull/7880).
|
|
@ -161,6 +161,7 @@ import traceback
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec
|
from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec
|
||||||
from ansible.module_utils.common.text.converters import to_native
|
from ansible.module_utils.common.text.converters import to_native
|
||||||
|
from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
|
||||||
|
|
||||||
|
|
||||||
class HBACRuleIPAClient(IPAClient):
|
class HBACRuleIPAClient(IPAClient):
|
||||||
|
@ -231,10 +232,17 @@ def ensure(module, client):
|
||||||
name = module.params['cn']
|
name = module.params['cn']
|
||||||
state = module.params['state']
|
state = module.params['state']
|
||||||
|
|
||||||
|
ipa_version = client.get_ipa_version()
|
||||||
if state in ['present', 'enabled']:
|
if state in ['present', 'enabled']:
|
||||||
ipaenabledflag = 'TRUE'
|
if LooseVersion(ipa_version) < LooseVersion('4.9.10'):
|
||||||
|
ipaenabledflag = 'TRUE'
|
||||||
|
else:
|
||||||
|
ipaenabledflag = True
|
||||||
else:
|
else:
|
||||||
ipaenabledflag = 'FALSE'
|
if LooseVersion(ipa_version) < LooseVersion('4.9.10'):
|
||||||
|
ipaenabledflag = 'FALSE'
|
||||||
|
else:
|
||||||
|
ipaenabledflag = False
|
||||||
|
|
||||||
host = module.params['host']
|
host = module.params['host']
|
||||||
hostcategory = module.params['hostcategory']
|
hostcategory = module.params['hostcategory']
|
||||||
|
|
|
@ -202,6 +202,7 @@ import traceback
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec
|
from ansible_collections.community.general.plugins.module_utils.ipa import IPAClient, ipa_argument_spec
|
||||||
from ansible.module_utils.common.text.converters import to_native
|
from ansible.module_utils.common.text.converters import to_native
|
||||||
|
from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
|
||||||
|
|
||||||
|
|
||||||
class SudoRuleIPAClient(IPAClient):
|
class SudoRuleIPAClient(IPAClient):
|
||||||
|
@ -334,10 +335,17 @@ def ensure(module, client):
|
||||||
runasgroupcategory = module.params['runasgroupcategory']
|
runasgroupcategory = module.params['runasgroupcategory']
|
||||||
runasextusers = module.params['runasextusers']
|
runasextusers = module.params['runasextusers']
|
||||||
|
|
||||||
|
ipa_version = client.get_ipa_version()
|
||||||
if state in ['present', 'enabled']:
|
if state in ['present', 'enabled']:
|
||||||
ipaenabledflag = 'TRUE'
|
if LooseVersion(ipa_version) < LooseVersion('4.9.10'):
|
||||||
|
ipaenabledflag = 'TRUE'
|
||||||
|
else:
|
||||||
|
ipaenabledflag = True
|
||||||
else:
|
else:
|
||||||
ipaenabledflag = 'FALSE'
|
if LooseVersion(ipa_version) < LooseVersion('4.9.10'):
|
||||||
|
ipaenabledflag = 'FALSE'
|
||||||
|
else:
|
||||||
|
ipaenabledflag = False
|
||||||
|
|
||||||
sudoopt = module.params['sudoopt']
|
sudoopt = module.params['sudoopt']
|
||||||
user = module.params['user']
|
user = module.params['user']
|
||||||
|
|
Loading…
Reference in a new issue