mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Create a common place to retrieve facts about an IPA installation
This is common to both client and server. Start with whether the client or server is configured. https://pagure.io/freeipa/issue/8384 Signed-off-by: Rob Crittenden <rcritten@redhat.com> Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com> Reviewed-By: Francois Cami <fcami@redhat.com>
This commit is contained in:
committed by
Florence Blanc-Renaud
parent
4758db121e
commit
d7a4756dac
@@ -43,7 +43,7 @@ from dns.exception import DNSException
|
||||
import ldap
|
||||
import six
|
||||
|
||||
from ipalib.install import sysrestore
|
||||
from ipalib import facts, sysrestore
|
||||
from ipalib.install.kinit import kinit_password
|
||||
import ipaplatform
|
||||
from ipapython import ipautil, admintool, version, ipaldap
|
||||
@@ -702,8 +702,12 @@ def is_ipa_configured():
|
||||
"""
|
||||
Use the state to determine if IPA has been configured.
|
||||
"""
|
||||
sstore = sysrestore.StateFile(paths.SYSRESTORE)
|
||||
return sstore.get_state('installation', 'complete')
|
||||
warnings.warn(
|
||||
"Use 'ipalib.facts.is_ipa_configured'",
|
||||
DeprecationWarning,
|
||||
stacklevel=2
|
||||
)
|
||||
return facts.is_ipa_configured()
|
||||
|
||||
|
||||
def run_script(main_function, operation_name, log_file_name=None,
|
||||
|
||||
@@ -32,13 +32,13 @@ import shutil
|
||||
|
||||
from ipalib import api
|
||||
from ipalib import x509
|
||||
from ipalib.facts import is_ipa_configured
|
||||
from ipaplatform.paths import paths
|
||||
from ipapython.admintool import AdminTool
|
||||
from ipapython.certdb import NSSDatabase, EMPTY_TRUST_FLAGS
|
||||
from ipapython.dn import DN
|
||||
from ipapython.ipaldap import realm_to_serverid
|
||||
from ipaserver.install import ca, cainstance, dsinstance
|
||||
from ipaserver.install.installutils import is_ipa_configured
|
||||
from ipapython import ipautil
|
||||
|
||||
msg = """
|
||||
|
||||
@@ -27,9 +27,10 @@ import ldapurl
|
||||
|
||||
from ipaserver.install import service, installutils
|
||||
from ipaserver.install.dsinstance import config_dirname
|
||||
from ipaserver.install.installutils import is_ipa_configured, ScriptError
|
||||
from ipaserver.install.installutils import ScriptError
|
||||
from ipaserver.masters import ENABLED_SERVICE, HIDDEN_SERVICE
|
||||
from ipalib import api, errors
|
||||
from ipalib.facts import is_ipa_configured
|
||||
from ipapython.ipaldap import LDAPClient, realm_to_serverid
|
||||
from ipapython.ipautil import wait_for_open_ports, wait_for_open_socket
|
||||
from ipapython.ipautil import run
|
||||
|
||||
@@ -32,6 +32,7 @@ from ipaplatform.paths import paths
|
||||
from ipaplatform.tasks import tasks
|
||||
from ipalib import api, errors, x509
|
||||
from ipalib.constants import DOMAIN_LEVEL_0
|
||||
from ipalib.facts import is_ipa_configured
|
||||
from ipalib.util import (
|
||||
validate_domain_name,
|
||||
no_matching_interface_for_ip_address_warning,
|
||||
@@ -43,8 +44,8 @@ from ipaserver.install import (
|
||||
sysupgrade, cainstance)
|
||||
from ipaserver.install.installutils import (
|
||||
IPA_MODULES, BadHostError, get_fqdn, get_server_ip_address,
|
||||
is_ipa_configured, load_pkcs12, read_password, verify_fqdn,
|
||||
update_hosts_file, validate_mask)
|
||||
load_pkcs12, read_password, verify_fqdn, update_hosts_file,
|
||||
validate_mask)
|
||||
|
||||
if six.PY3:
|
||||
unicode = str
|
||||
|
||||
@@ -35,13 +35,14 @@ from ipaplatform.tasks import tasks
|
||||
from ipaplatform.paths import paths
|
||||
from ipalib import api, constants, create_api, errors, rpc, x509
|
||||
from ipalib.config import Env
|
||||
from ipalib.facts import is_ipa_configured
|
||||
from ipalib.util import no_matching_interface_for_ip_address_warning
|
||||
from ipaclient.install.client import configure_krb5_conf, purge_host_keytab
|
||||
from ipaserver.install import (
|
||||
adtrust, bindinstance, ca, dns, dsinstance, httpinstance,
|
||||
installutils, kra, krbinstance, otpdinstance, custodiainstance, service)
|
||||
from ipaserver.install.installutils import (
|
||||
ReplicaConfig, load_pkcs12, is_ipa_configured, validate_mask)
|
||||
ReplicaConfig, load_pkcs12, validate_mask)
|
||||
from ipaserver.install.replication import (
|
||||
ReplicationManager, replica_conn_check)
|
||||
from ipaserver.masters import find_providing_servers, find_providing_server
|
||||
|
||||
@@ -22,7 +22,9 @@ from augeas import Augeas
|
||||
|
||||
from ipalib import api, x509
|
||||
from ipalib.constants import RENEWAL_CA_NAME, RA_AGENT_PROFILE, IPA_CA_RECORD
|
||||
from ipalib.install import certmonger, sysrestore
|
||||
from ipalib.install import certmonger
|
||||
from ipalib import sysrestore
|
||||
from ipalib.facts import is_ipa_configured
|
||||
import SSSDConfig
|
||||
import ipalib.util
|
||||
import ipalib.errors
|
||||
@@ -1484,7 +1486,7 @@ def upgrade_configuration():
|
||||
fstore = sysrestore.FileStore(paths.SYSRESTORE)
|
||||
sstore = sysrestore.StateFile(paths.SYSRESTORE)
|
||||
|
||||
if installutils.is_ipa_configured() is None:
|
||||
if is_ipa_configured() is None:
|
||||
sstore.backup_state('installation', 'complete', True)
|
||||
|
||||
fqdn = api.env.host
|
||||
|
||||
Reference in New Issue
Block a user