diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-05-13 10:53:59 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-05-15 10:22:28 +0000 |
| commit | 3c86b0ef3e684d45301ae2c2452932ea4f279f08 (patch) | |
| tree | 06bafd07e687b903338cf2ad8dcd643d819a7e69 /ipaplatform/redhat | |
| parent | 9a1a409d63e30dcb939b672d352fc4aa7ba690fe (diff) | |
| download | freeipa-3c86b0ef3e684d45301ae2c2452932ea4f279f08.tar.gz freeipa-3c86b0ef3e684d45301ae2c2452932ea4f279f08.tar.xz freeipa-3c86b0ef3e684d45301ae2c2452932ea4f279f08.zip | |
Dont use the proxy to check CA status
Checking status of the CA via proxy cause issues when httpd instance is
down.
To check status of CA we do not need proxy.
https://fedorahosted.org/freeipa/ticket/4994
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaplatform/redhat')
| -rw-r--r-- | ipaplatform/redhat/services.py | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ipaplatform/redhat/services.py b/ipaplatform/redhat/services.py index c9994e409..d6fa080ad 100644 --- a/ipaplatform/redhat/services.py +++ b/ipaplatform/redhat/services.py @@ -171,16 +171,6 @@ class RedHatSSHService(RedHatService): class RedHatCAService(RedHatService): def wait_until_running(self): - # We must not wait for the httpd proxy if httpd is not set up yet. - # Unfortunately, knownservices.httpd.is_installed() can return - # false positives, so check for existence of our configuration file. - # TODO: Use a cleaner solution - use_proxy = True - if not (os.path.exists('/etc/httpd/conf.d/ipa.conf') and - os.path.exists(paths.HTTPD_IPA_PKI_PROXY_CONF)): - root_logger.debug( - 'The httpd proxy is not installed, wait on local port') - use_proxy = False root_logger.debug('Waiting until the CA is running') timeout = float(api.env.startup_timeout) op_timeout = time.time() + timeout @@ -192,8 +182,6 @@ class RedHatCAService(RedHatService): # status = dogtag.ca_status(use_proxy=use_proxy) # port = 8443 - if use_proxy: - port = 443 url = "https://%(host_port)s%(path)s" % { "host_port": ipautil.format_netloc(api.env.ca_host, port), |