diff options
| author | Ana Krivokapic <akrivoka@redhat.com> | 2013-07-18 19:51:22 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-07-19 12:37:43 +0200 |
| commit | 8a22bce24233ddd4ec9764cecf410c159284f370 (patch) | |
| tree | 513282b2b98a7c2ff575948513b93789c57b0721 /ipa-client | |
| parent | efb7a2d54d4d7498d60e5e212ef4d53fa5fe39d4 (diff) | |
| download | freeipa.git-8a22bce24233ddd4ec9764cecf410c159284f370.tar.gz freeipa.git-8a22bce24233ddd4ec9764cecf410c159284f370.tar.xz freeipa.git-8a22bce24233ddd4ec9764cecf410c159284f370.zip | |
Use admin@REALM when testing if SSSD is ready
https://fedorahosted.org/freeipa/ticket/3771
Diffstat (limited to 'ipa-client')
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-automount | 8 | ||||
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ipa-client/ipa-install/ipa-client-automount b/ipa-client/ipa-install/ipa-client-automount index 3952642b..346b474f 100755 --- a/ipa-client/ipa-install/ipa-client-automount +++ b/ipa-client/ipa-install/ipa-client-automount @@ -77,7 +77,7 @@ def wait_for_sssd(): time.sleep(1) while n < 10 and not found: try: - ipautil.run(["getent", "passwd", "admin"]) + ipautil.run(["getent", "passwd", "admin@%s" % api.env.realm]) found = True except Exception, e: time.sleep(1) @@ -85,8 +85,10 @@ def wait_for_sssd(): # This should never happen but if it does, may as well warn the user if not found: - root_logger.debug("Unable to find 'admin' user with 'getent passwd admin'!") - print "Unable to find 'admin' user with 'getent passwd admin'!" + err_msg = ("Unable to find 'admin' user with " + "'getent passwd admin@%s'!" % api.env.realm) + root_logger.debug(err_msg) + print err_msg print "This may mean that sssd didn't re-start properly after the configuration changes." def configure_xml(fstore): diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index ce7fadee..280edd79 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -2476,7 +2476,7 @@ def install(options, env, fstore, statestore): # Particulary, SSSD might take longer than 6-8 seconds. while n < 10 and not found: try: - ipautil.run(["getent", "passwd", "admin"]) + ipautil.run(["getent", "passwd", "admin@%s" % cli_realm]) found = True except Exception, e: time.sleep(1) @@ -2484,7 +2484,8 @@ def install(options, env, fstore, statestore): if not found: root_logger.error( - "Unable to find 'admin' user with 'getent passwd admin'!") + "Unable to find 'admin' user with " + "'getent passwd admin@%s'!" % cli_realm) if conf: root_logger.info("Recognized configuration: %s", conf) else: |