Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Ansible FreeIPA
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Ansible FreeIPA
Commits
2cb11d44
Unverified
Commit
2cb11d44
authored
Jan 13, 2022
by
Rafael Guterres Jeffman
Committed by
GitHub
Jan 13, 2022
Browse files
Options
Downloads
Plain Diff
Merge pull request #729 from t-woerner/fix_new_ansible_test_findings
ansible-test: Fix new findings
parents
7632f90e
9499a3ed
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/ipaserver/library/ipaserver_prepare.py
+2
-2
2 additions, 2 deletions
roles/ipaserver/library/ipaserver_prepare.py
roles/ipaserver/module_utils/ansible_ipa_server.py
+17
-17
17 additions, 17 deletions
roles/ipaserver/module_utils/ansible_ipa_server.py
with
19 additions
and
19 deletions
roles/ipaserver/library/ipaserver_prepare.py
+
2
−
2
View file @
2cb11d44
...
@@ -393,8 +393,8 @@ def main():
...
@@ -393,8 +393,8 @@ def main():
ansible_log
.
info
(
"
Disabled p11-kit-proxy
"
)
ansible_log
.
info
(
"
Disabled p11-kit-proxy
"
)
except
(
RuntimeError
,
ValueError
,
ScriptError
,
except
(
RuntimeError
,
ValueError
,
ScriptError
,
ipautil
.
CalledProcessError
)
as
e
:
ipautil
.
CalledProcessError
)
as
e
rr
:
ansible_module
.
fail_json
(
msg
=
str
(
e
))
ansible_module
.
fail_json
(
msg
=
str
(
e
rr
))
ansible_module
.
exit_json
(
ansible_module
.
exit_json
(
changed
=
True
,
changed
=
True
,
...
...
This diff is collapsed.
Click to expand it.
roles/ipaserver/module_utils/ansible_ipa_server.py
+
17
−
17
View file @
2cb11d44
...
@@ -330,9 +330,9 @@ else:
...
@@ -330,9 +330,9 @@ else:
_no_hbac_allow
,
dirsrv_pkcs12_info
,
no_pkinit
):
_no_hbac_allow
,
dirsrv_pkcs12_info
,
no_pkinit
):
if
not
options
.
external_cert_files
:
if
not
options
.
external_cert_files
:
ds
=
dsinstance
.
DsInstance
(
fstore
=
fstore
,
domainlevel
=
domainlevel
,
_
ds
=
dsinstance
.
DsInstance
(
fstore
=
fstore
,
domainlevel
=
domainlevel
,
config_ldif
=
dirsrv_config_file
)
config_ldif
=
dirsrv_config_file
)
ds
.
set_output
(
ansible_log
)
_
ds
.
set_output
(
ansible_log
)
if
options
.
dirsrv_cert_files
:
if
options
.
dirsrv_cert_files
:
_dirsrv_pkcs12_info
=
dirsrv_pkcs12_info
_dirsrv_pkcs12_info
=
dirsrv_pkcs12_info
...
@@ -340,30 +340,30 @@ else:
...
@@ -340,30 +340,30 @@ else:
_dirsrv_pkcs12_info
=
None
_dirsrv_pkcs12_info
=
None
with
redirect_stdout
(
ansible_log
):
with
redirect_stdout
(
ansible_log
):
ds
.
init_info
(
realm_name
,
host_name
,
domain_name
,
dm_password
,
_
ds
.
init_info
(
realm_name
,
host_name
,
domain_name
,
dm_password
,
subject_base
,
ca_subject
,
idstart
,
idmax
,
subject_base
,
ca_subject
,
idstart
,
idmax
,
# hbac_allow=not no_hbac_allow,
# hbac_allow=not no_hbac_allow,
_dirsrv_pkcs12_info
,
setup_pkinit
=
not
no_pkinit
)
_dirsrv_pkcs12_info
,
setup_pkinit
=
not
no_pkinit
)
else
:
else
:
ds
=
dsinstance
.
DsInstance
(
fstore
=
fstore
,
domainlevel
=
domainlevel
)
_
ds
=
dsinstance
.
DsInstance
(
fstore
=
fstore
,
domainlevel
=
domainlevel
)
ds
.
set_output
(
ansible_log
)
_
ds
.
set_output
(
ansible_log
)
with
redirect_stdout
(
ansible_log
):
with
redirect_stdout
(
ansible_log
):
ds
.
init_info
(
realm_name
,
host_name
,
domain_name
,
dm_password
,
_
ds
.
init_info
(
realm_name
,
host_name
,
domain_name
,
dm_password
,
subject_base
,
ca_subject
,
1101
,
1100
,
None
,
subject_base
,
ca_subject
,
1101
,
1100
,
None
,
setup_pkinit
=
not
no_pkinit
)
setup_pkinit
=
not
no_pkinit
)
return
ds
return
_
ds
def
ansible_module_get_parsed_ip_addresses
(
ansible_module
,
def
ansible_module_get_parsed_ip_addresses
(
ansible_module
,
param
=
'
ip_addresses
'
):
param
=
'
ip_addresses
'
):
ip_addrs
=
[]
ip_addrs
=
[]
for
ip
in
ansible_module
.
params
.
get
(
param
):
for
_
ip
in
ansible_module
.
params
.
get
(
param
):
try
:
try
:
ip_parsed
=
ipautil
.
CheckedIPAddress
(
ip
)
ip_parsed
=
ipautil
.
CheckedIPAddress
(
_
ip
)
except
Exception
as
e
:
except
Exception
as
e
rr
:
ansible_module
.
fail_json
(
ansible_module
.
fail_json
(
msg
=
"
Invalid IP Address %s: %s
"
%
(
ip
,
e
))
msg
=
"
Invalid IP Address %s: %s
"
%
(
_
ip
,
e
rr
))
ip_addrs
.
append
(
ip_parsed
)
ip_addrs
.
append
(
ip_parsed
)
return
ip_addrs
return
ip_addrs
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment