Skip to content
Snippets Groups Projects
Unverified Commit feb33e4e authored by Varun Mylaraiah's avatar Varun Mylaraiah Committed by GitHub
Browse files

Merge pull request #1340 from t-woerner/dns_over_tls_hotfix

ipa* deployment roles: Hotfix for dns_over_tls (Freeipa#7343)
parents e8688d4c 3c50a812
No related branches found
No related tags found
No related merge requests found
...@@ -279,6 +279,7 @@ def main(): ...@@ -279,6 +279,7 @@ def main():
options.no_sssd = False options.no_sssd = False
options.sssd = not options.no_sssd options.sssd = not options.no_sssd
options.no_ac = False options.no_ac = False
options.dns_over_tls = False
nosssd_files = module.params.get('nosssd_files') nosssd_files = module.params.get('nosssd_files')
selinux_works = module.params.get('selinux_works') selinux_works = module.params.get('selinux_works')
krb_name = module.params.get('krb_name') krb_name = module.params.get('krb_name')
...@@ -376,6 +377,11 @@ def main(): ...@@ -376,6 +377,11 @@ def main():
ssh_config_dir = paths.SSH_CONFIG_DIR ssh_config_dir = paths.SSH_CONFIG_DIR
else: else:
ssh_config_dir = services.knownservices.sshd.get_config_dir() ssh_config_dir = services.knownservices.sshd.get_config_dir()
argspec_update_ssh_keys = getargspec(update_ssh_keys)
# Hotfix for https://github.com/freeipa/freeipa/pull/7343
if "options" in argspec_update_ssh_keys.args:
update_ssh_keys(hostname, ssh_config_dir, options, cli_server[0])
else:
update_ssh_keys(hostname, ssh_config_dir, options.create_sshfp) update_ssh_keys(hostname, ssh_config_dir, options.create_sshfp)
try: try:
......
...@@ -331,6 +331,13 @@ options.add_agents = False ...@@ -331,6 +331,13 @@ options.add_agents = False
# ServerReplicaInstall # ServerReplicaInstall
options.subject_base = None options.subject_base = None
options.ca_subject = None options.ca_subject = None
# Hotfix for https://github.com/freeipa/freeipa/pull/7343
options.dns_over_tls = False
options.dns_over_tls_key = None
options.dns_over_tls_cert = None
options.dot_forwarders = None
options.dns_policy = None
# pylint: enable=attribute-defined-outside-init # pylint: enable=attribute-defined-outside-init
......
...@@ -354,6 +354,13 @@ options.add_agents = False ...@@ -354,6 +354,13 @@ options.add_agents = False
# no_msdcs is deprecated # no_msdcs is deprecated
options.no_msdcs = False options.no_msdcs = False
# Hotfix for https://github.com/freeipa/freeipa/pull/7343
options.dns_over_tls = False
options.dns_over_tls_key = None
options.dns_over_tls_cert = None
options.dot_forwarders = None
options.dns_policy = None
# For pylint # For pylint
options.external_cert_files = None options.external_cert_files = None
options.dirsrv_cert_files = None options.dirsrv_cert_files = None
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment