internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-30 03:14:42 +00:00
Code Issues Projects Releases Wiki Activity

library/ipadiscovery.py: Drop subject base guessing

Browse Source 
The subject base generated in discovery is only a guess and might have been
changed by the admin at installation process. Therefore it is needed to
get this from the server - done in ipaapi as we are authenticaed there already
to use the api.
This commit is contained in:
Thomas Woerner
2017-09-25 15:55:49 +02:00
parent 6dc469fdb8
commit 7ee3cead85
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/ipadiscovery.py
View File

@@ -130,11 +130,6 @@ dnsok:
description: True if DNS discovery worked and not passed in any servers. description: True if DNS discovery worked and not passed in any servers.
returned: always returned: always
type: bool type: bool
subject_base:
description: The subject base, needed for certmonger
returned: always
type: string
sample: O=EXAMPLE.COM
ntp_servers: ntp_servers:
description: The list of detected NTP servers. description: The list of detected NTP servers.
returned: always returned: always
@@ -161,7 +156,6 @@ if NUM_VERSION < 30201:
IPA_PYTHON_VERSION = IPA_MAJOR*10000 + IPA_MINOR*100 + IPA_RELEASE IPA_PYTHON_VERSION = IPA_MAJOR*10000 + IPA_MINOR*100 + IPA_RELEASE
else: else:
IPA_PYTHON_VERSION = NUM_VERSION IPA_PYTHON_VERSION = NUM_VERSION
from ipapython.dn import DN
from ipaplatform.paths import paths from ipaplatform.paths import paths
try: try:
from ipaclient.install import ipadiscovery from ipaclient.install import ipadiscovery
@@ -249,7 +243,6 @@ def main():
dnsok = False dnsok = False
cli_domain = None cli_domain = None
cli_server = None cli_server = None
subject_base = None
cli_realm = None cli_realm = None
cli_kdc = None cli_kdc = None
client_domain = None client_domain = None
@@ -408,7 +401,6 @@ def main():
cli_basedn = str(ds.basedn) cli_basedn = str(ds.basedn)
cli_basedn_source = ds.basedn_source cli_basedn_source = ds.basedn_source
module.debug("will use discovered basedn: %s" % cli_basedn) module.debug("will use discovered basedn: %s" % cli_basedn)
subject_base = str(DN(('O', cli_realm)))
module.log("Client hostname: %s" % hostname) module.log("Client hostname: %s" % hostname)
module.debug("Hostname source: %s" % hostname_source) module.debug("Hostname source: %s" % hostname_source)
@@ -466,7 +458,6 @@ def main():
hostname=hostname, hostname=hostname,
client_domain=client_domain, client_domain=client_domain,
dnsok=dnsok, dnsok=dnsok,
subject_base=subject_base,
ntp_servers=ntp_servers, ntp_servers=ntp_servers,
ipa_python_version=IPA_PYTHON_VERSION) ipa_python_version=IPA_PYTHON_VERSION)