summaryrefslogtreecommitdiffstats
path: root/ipapython/platform/fedora16/service.py
diff options
context:
space:
mode:
Diffstat (limited to 'ipapython/platform/fedora16/service.py')
-rw-r--r--ipapython/platform/fedora16/service.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/ipapython/platform/fedora16/service.py b/ipapython/platform/fedora16/service.py
index 36e7a31c4..edf2d7ff8 100644
--- a/ipapython/platform/fedora16/service.py
+++ b/ipapython/platform/fedora16/service.py
@@ -143,17 +143,18 @@ class Fedora16CAService(Fedora16Service):
# 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('/etc/httpd/conf.d/ipa-pki-proxy.conf')):
root_logger.debug(
- 'The httpd proxy is not installed, skipping wait for CA')
- return
+ 'The httpd proxy is not installed, wait on local port')
+ use_proxy = False
root_logger.debug('Waiting until the CA is running')
timeout = api.env.startup_timeout
op_timeout = time.time() + timeout
while time.time() < op_timeout:
try:
- status = dogtag.ca_status()
+ status = dogtag.ca_status(use_proxy=use_proxy)
except Exception:
status = 'check interrupted'
root_logger.debug('The CA status is: %s' % status)