diff options
| author | Ade Lee <alee@redhat.com> | 2012-09-19 23:35:42 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-11-23 12:19:19 +0100 |
| commit | 18a210996dc47dbc9979e5ee0bb9f184c22eb173 (patch) | |
| tree | 41a99a8d78e7f32a5372518f36415ff2f15ca466 /ipaserver/install/installutils.py | |
| parent | 7960b5c67f0577e305d9fd86564b19957872d0e3 (diff) | |
| download | freeipa.git-18a210996dc47dbc9979e5ee0bb9f184c22eb173.tar.gz freeipa.git-18a210996dc47dbc9979e5ee0bb9f184c22eb173.tar.xz freeipa.git-18a210996dc47dbc9979e5ee0bb9f184c22eb173.zip | |
Changes to use a single database for dogtag and IPA
New servers that are installed with dogtag 10 instances will use
a single database instance for dogtag and IPA, albeit with different
suffixes. Dogtag will communicate with the instance through a
database user with permissions to modify the dogtag suffix only.
This user will authenticate using client auth using the subsystem cert
for the instance.
This patch includes changes to allow the creation of masters and clones
with single ds instances.
Diffstat (limited to 'ipaserver/install/installutils.py')
| -rw-r--r-- | ipaserver/install/installutils.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 754d5fc9..3368533d 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -38,7 +38,7 @@ from dns import resolver, rdatatype from dns.exception import DNSException import ldap -from ipapython import ipautil, sysrestore, admintool +from ipapython import ipautil, sysrestore, admintool, dogtag from ipapython.admintool import ScriptError from ipapython.ipa_log_manager import * from ipalib.util import validate_hostname @@ -48,8 +48,11 @@ from ipapython.dn import DN # Used to determine install status IPA_MODULES = [ - 'httpd', 'kadmin', 'dirsrv', 'pki-cad', 'pki-tomcatd', 'pkids', 'install', + 'httpd', 'kadmin', 'dirsrv', 'pki-cad', 'pki-tomcatd', 'install', 'krb5kdc', 'ntpd', 'named', 'ipa_memcached'] +if not dogtag.install_constants.SHARED_DB: + IPA_MODULES.append('pkids') + class BadHostError(Exception): pass |