summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/dsinstance.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-08-24 11:28:20 -0400
committerRob Crittenden <rcritten@redhat.com>2011-08-25 20:53:37 -0400
commitc3ee9b32087c2f5778d70d8ada4508db5a56f6bf (patch)
treef49e127b23d30e437634d2346cf2798a57669e63 /ipaserver/install/dsinstance.py
parenta6220962541946f681dc1de400c76d80b71fa2e2 (diff)
downloadfreeipa-c3ee9b32087c2f5778d70d8ada4508db5a56f6bf.zip
freeipa-c3ee9b32087c2f5778d70d8ada4508db5a56f6bf.tar.gz
freeipa-c3ee9b32087c2f5778d70d8ada4508db5a56f6bf.tar.xz
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
Diffstat (limited to 'ipaserver/install/dsinstance.py')
-rw-r--r--ipaserver/install/dsinstance.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 2284825..5006083 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -681,6 +681,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()