internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-31 20:04:45 +00:00
Code Issues Projects Releases Wiki Activity

ipareplica_setup_http: Use inspect on install_http

Browse Source 
The promote argument has been dropped with the final removal of domain
level 0 support in version 4.7.1. The fstore argument has been added
with the 4.7.1 version also.
This commit is contained in:
Thomas Woerner
2019-03-26 12:59:18 +01:00
parent 9fb32b2322
commit 5f6efc32d2
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
roles/ipareplica/library/ipareplica_setup_http.py
View File

@@ -188,6 +188,8 @@ def main():
create_ipa_conf(fstore, config, ca_enabled, create_ipa_conf(fstore, config, ca_enabled,
master=config.master_host_name) master=config.master_host_name)
argspec = inspect.getargspec(install_http)
if "promote" in argspec.args:
install_http( install_http(
config, config,
auto_redirect=not options.no_ui_redirect, auto_redirect=not options.no_ui_redirect,
@@ -195,6 +197,22 @@ def main():
pkcs12_info=http_pkcs12_info, pkcs12_info=http_pkcs12_info,
ca_is_configured=ca_enabled, ca_is_configured=ca_enabled,
ca_file=cafile) ca_file=cafile)
else:
if "fstore" not in argspec.args:
install_http(
config,
auto_redirect=not options.no_ui_redirect,
pkcs12_info=http_pkcs12_info,
ca_is_configured=ca_enabled,
ca_file=cafile)
else:
install_http(
config,
auto_redirect=not options.no_ui_redirect,
pkcs12_info=http_pkcs12_info,
ca_is_configured=ca_enabled,
ca_file=cafile,
fstore=fstore)
# Need to point back to ourself after the cert for HTTP is obtained # Need to point back to ourself after the cert for HTTP is obtained
create_ipa_conf(fstore, config, ca_enabled) create_ipa_conf(fstore, config, ca_enabled)