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

Merge pull request #1226 from t-woerner/ipalib.install.kinit_moved_to_ipalib_freeipa_7286

Browse Source 
ipalib.install.kinit moved to ipalib
This commit is contained in:
Rafael Guterres Jeffman
2024-03-28 10:57:02 -03:00
committed by GitHub
parent 4ceb6aa05d 35614d7a88
commit cbff802d13
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/module_utils/ansible_freeipa_module.py
View File

@@ -87,9 +87,13 @@ try:
from ipalib.constants import DEFAULT_CONFIG, LDAP_GENERALIZED_TIME_FORMAT from ipalib.constants import DEFAULT_CONFIG, LDAP_GENERALIZED_TIME_FORMAT
try: try:
from ipalib.install.kinit import kinit_password, kinit_keytab from ipalib.kinit import kinit_password, kinit_keytab
except ImportError: except ImportError:
from ipapython.ipautil import kinit_password, kinit_keytab try:
from ipalib.install.kinit import kinit_password, kinit_keytab
except ImportError:
# pre 4.5.0
from ipapython.ipautil import kinit_password, kinit_keytab
from ipapython.ipautil import run from ipapython.ipautil import run
from ipapython.ipautil import template_str from ipapython.ipautil import template_str
from ipapython.dn import DN from ipapython.dn import DN

8
roles/ipaclient/library/ipaclient_get_otp.py
View File

@@ -89,9 +89,13 @@ try:
from ipapython.ipautil import run from ipapython.ipautil import run
from ipalib.constants import DEFAULT_CONFIG from ipalib.constants import DEFAULT_CONFIG
try: try:
from ipalib.install.kinit import kinit_password, kinit_keytab from ipalib.kinit import kinit_password, kinit_keytab
except ImportError: except ImportError:
from ipapython.ipautil import kinit_password, kinit_keytab try:
from ipalib.install.kinit import kinit_password, kinit_keytab
except ImportError:
# pre 4.5.0
from ipapython.ipautil import kinit_password, kinit_keytab
except ImportError as _err: except ImportError as _err:
MODULE_IMPORT_ERROR = str(_err) MODULE_IMPORT_ERROR = str(_err)
else: else:

8
roles/ipaclient/module_utils/ansible_ipa_client.py
View File

@@ -173,9 +173,13 @@ try:
ipa_generate_password ipa_generate_password
from ipapython.dn import DN from ipapython.dn import DN
try: try:
from ipalib.install.kinit import kinit_keytab, kinit_password from ipalib.kinit import kinit_password, kinit_keytab
except ImportError: except ImportError:
from ipapython.ipautil import kinit_keytab, kinit_password try:
from ipalib.install.kinit import kinit_keytab, kinit_password
except ImportError:
# pre 4.5.0
from ipapython.ipautil import kinit_keytab, kinit_password
from ipapython.ipa_log_manager import standard_logging_setup from ipapython.ipa_log_manager import standard_logging_setup
from gssapi.exceptions import GSSError from gssapi.exceptions import GSSError
try: try:

5
roles/ipareplica/module_utils/ansible_ipa_replica.py
View File

@@ -104,7 +104,10 @@ try:
from ipaclient.install.ipachangeconf import IPAChangeConf from ipaclient.install.ipachangeconf import IPAChangeConf
from ipalib.install import certstore, sysrestore from ipalib.install import certstore, sysrestore
from ipapython.ipautil import ipa_generate_password from ipapython.ipautil import ipa_generate_password
from ipalib.install.kinit import kinit_keytab try:
from ipalib.kinit import kinit_keytab
except ImportError:
from ipalib.install.kinit import kinit_keytab
from ipapython import ipaldap, ipautil, kernel_keyring from ipapython import ipaldap, ipautil, kernel_keyring
from ipapython.certdb import IPA_CA_TRUST_FLAGS, \ from ipapython.certdb import IPA_CA_TRUST_FLAGS, \
EXTERNAL_CA_TRUST_FLAGS EXTERNAL_CA_TRUST_FLAGS

8
roles/ipaserver/library/ipaserver_get_connected_server.py
View File

@@ -77,9 +77,13 @@ try:
from ipapython.ipautil import run from ipapython.ipautil import run
from ipalib.constants import DEFAULT_CONFIG from ipalib.constants import DEFAULT_CONFIG
try: try:
from ipalib.install.kinit import kinit_password from ipalib.kinit import kinit_password
except ImportError: except ImportError:
from ipapython.ipautil import kinit_password try:
from ipalib.install.kinit import kinit_password
except ImportError:
# pre 4.5.0
from ipapython.ipautil import kinit_password
except ImportError as _err: except ImportError as _err:
MODULE_IMPORT_ERROR = str(_err) MODULE_IMPORT_ERROR = str(_err)
else: else: