internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-06-11 19:25:54 +00:00
Code Issues Projects Releases Wiki Activity

library/ipajoin.py: Fixed white spaces for comments and imports

Browse Source
This commit is contained in:
Thomas Woerner
2017-10-05 10:42:35 +02:00
parent ea77aa2820
commit 99c0891880
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/ipajoin.py
View File

@@ -139,14 +139,16 @@ try:
except ImportError: except ImportError:
from ipapython.ipautil import kinit_keytab, kinit_password from ipapython.ipautil import kinit_keytab, kinit_password
try: try:
from ipaclient.install.client import configure_krb5_conf, get_ca_certs, SECURE_PATH from ipaclient.install.client import configure_krb5_conf, get_ca_certs, \
SECURE_PATH
except ImportError: except ImportError:
# Create temporary copy of ipa-client-install script (as # Create temporary copy of ipa-client-install script (as
# ipa_client_install.py) to be able to import the script easily and also # ipa_client_install.py) to be able to import the script easily
# to remove the global finally clause in which the generated ccache file # and also to remove the global finally clause in which the
# gets removed. The ccache file will be needed in the next step. # generated ccache file gets removed. The ccache file will be
# This is done in a temporary directory that gets removed right after # needed in the next step.
# ipa_client_install has been imported. # This is done in a temporary directory that gets removed right
# after ipa_client_install has been imported.
import shutil import shutil
temp_dir = tempfile.mkdtemp(dir="/tmp") temp_dir = tempfile.mkdtemp(dir="/tmp")
sys.path.append(temp_dir) sys.path.append(temp_dir)
@@ -338,8 +340,8 @@ def main():
if principal: if principal:
run(["kdestroy"], raiseonerr=False, env=env) run(["kdestroy"], raiseonerr=False, env=env)
# Obtain the TGT. We do it with the temporary krb5.conf, so that # Obtain the TGT. We do it with the temporary krb5.conf, sot
# only the KDC we're installing under is contacted. # tha only the KDC we're installing under is contacted.
# Other KDCs might not have replicated the principal yet. # Other KDCs might not have replicated the principal yet.
# Once we have the TGT, it's usable on any server. # Once we have the TGT, it's usable on any server.
try: try: