diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-10-21 15:25:21 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2011-11-16 10:26:35 +0100 |
| commit | 8be0d84a599be48e837d498cec45d08cbccd3a03 (patch) | |
| tree | 8ba82f1f22e39623204bd7b979c2f48129ada653 /ipaserver | |
| parent | 70cb8bf35550189ebaed4fe088aad653ed0781aa (diff) | |
| download | freeipa-8be0d84a599be48e837d498cec45d08cbccd3a03.tar.gz freeipa-8be0d84a599be48e837d498cec45d08cbccd3a03.tar.xz freeipa-8be0d84a599be48e837d498cec45d08cbccd3a03.zip | |
Don't check for 389-instances.
We no longer need to enforce that no 389-ds instances exist on an IPA
server. Checking that the ports exist should be enough.
This used to be one mechanism we used to check to see if IPA was already
installed. We have a better mechanism now.
https://fedorahosted.org/freeipa/ticket/1735
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index c1b6531a4..8ca33c13c 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -90,18 +90,6 @@ def erase_ds_instance_data(serverid): # except: # pass -def check_existing_installation(): - dirs = glob.glob("/etc/dirsrv/slapd-*") - if not dirs: - return [] - - serverids = [] - for d in dirs: - logging.debug('Found existing 389-ds instance %s' % d) - serverids.append(os.path.basename(d).split("slapd-", 1)[1]) - - return serverids - def check_ports(): ds_unsecure = installutils.port_available(389) ds_secure = installutils.port_available(636) @@ -648,7 +636,7 @@ class DsInstance(service.Service): self.restore_state('nsslapd-security') self.restore_state('nsslapd-ldapiautobind') - if self.restore_state("running"): + if running: self.start() # we could probably move this function into the service.Service |