diff options
author | Rob Crittenden <rcritten@redhat.com> | 2011-08-24 11:28:20 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2011-08-25 20:52:46 -0400 |
commit | e4b62d05294c6d00fddd1ad574085ddba1b887ee (patch) | |
tree | bae2ae7d0743f48fd47784ad56a870ffc06f666a | |
parent | de83684c753b09f72c047fe7adce74dfa730b953 (diff) | |
download | freeipa-e4b62d05294c6d00fddd1ad574085ddba1b887ee.tar.gz freeipa-e4b62d05294c6d00fddd1ad574085ddba1b887ee.tar.xz freeipa-e4b62d05294c6d00fddd1ad574085ddba1b887ee.zip |
Remove 389-ds upgrade state during uninstall
When we perform an upgrade 389-ds is set to listen only on its
ldapi port. Theoretically it should be restored to the previous
state regardless of whether the upgrades were successful or not.
To be sure that a subsequent re-install will be successful go ahead
and remove the state for these options. Think of it as wearing a
belt and suspenders. Otherwise a re-install could return an error
message that IPA is already configured.
https://fedorahosted.org/freeipa/ticket/1667
-rw-r--r-- | ipaserver/install/dsinstance.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 008aee3e5..7243a61dc 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -683,6 +683,12 @@ class DsInstance(service.Service): except ipautil.CalledProcessError, e: logging.critical("failed to delete user %s" % e) + # Make sure some upgrade-related state is removed. This could cause + # re-installation problems. + self.restore_state('nsslapd-port') + self.restore_state('nsslapd-security') + self.restore_state('nsslapd-ldapiautobind') + if self.restore_state("running"): self.start() |