diff options
| author | Martin Babinsky <mbabinsk@redhat.com> | 2015-01-21 13:40:36 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2015-01-27 13:35:06 +0100 |
| commit | 55b7eed77e5f76c159ba157d020e93aa9d43bdc5 (patch) | |
| tree | 9b587e418aef58783595608b272042d6564896b0 /install/tools | |
| parent | c90286cbbc1ab21e185c4d60d3a86142172c47ca (diff) | |
| download | freeipa-55b7eed77e5f76c159ba157d020e93aa9d43bdc5.tar.gz freeipa-55b7eed77e5f76c159ba157d020e93aa9d43bdc5.tar.xz freeipa-55b7eed77e5f76c159ba157d020e93aa9d43bdc5.zip | |
Use 'remove-ds.pl' to remove DS instance
The patch adds a function which calls 'remove-ds.pl' during DS instance
removal. This should allow for a more thorough removal of DS related data
during server uninstallation (such as closing custom ports, cleaning up
slapd-* entries etc.)
This patch is related to https://fedorahosted.org/freeipa/ticket/4487.
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'install/tools')
| -rwxr-xr-x | install/tools/ipa-server-install | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 11055aee3..8b2b8a3c2 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -414,7 +414,11 @@ def signal_handler(signum, frame): print "Removing configuration for %s instance" % ds.serverid ds.stop() if ds.serverid: - dsinstance.erase_ds_instance_data (ds.serverid) + try: + dsinstance.remove_ds_instance(ds.serverid) + except ipautil.CalledProcessError: + root_logger.error("Failed to remove DS instance. You may " + "need to remove instance data manually") sys.exit(1) def read_cache(dm_password): |