Move CACERT definition to a single place.

Reviewed-By: Petr Viktorin <pviktori@redhat.com>
This commit is contained in:
Jan Cholasta
2013-09-11 08:27:34 +00:00
committed by Petr Viktorin
parent 4c761108e8
commit fea7163e87
17 changed files with 24 additions and 23 deletions

View File

@@ -38,6 +38,7 @@ from ipalib import api, errors
from ipalib.util import (validate_zonemgr, normalize_zonemgr,
get_dns_forward_zone_update_policy, get_dns_reverse_zone_update_policy,
normalize_zone, get_reverse_zone_default, zone_is_reverse)
from ipalib.constants import CACERT
NAMED_CONF = '/etc/named.conf'
RESOLV_CONF = '/etc/resolv.conf'
@@ -206,7 +207,7 @@ def dns_container_exists(fqdn, suffix, dm_password=None, ldapi=False, realm=None
if ldapi:
conn = ipaldap.IPAdmin(host=fqdn, ldapi=True, realm=realm)
else:
conn = ipaldap.IPAdmin(host=fqdn, port=636, cacert=service.CACERT)
conn = ipaldap.IPAdmin(host=fqdn, port=636, cacert=CACERT)
if dm_password:
conn.do_simple_bind(bindpw=dm_password)