summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2018-03-12 15:05:55 +0100
committerChristian Heimes <cheimes@redhat.com>2018-11-13 12:07:27 +0100
commit56f8e200131a0972e03b15c3cc3ae1dc30bf09b0 (patch)
tree0e14b968520fd41a4205dd63dc61dfe203ba060f
parented955d14d3bc79dbbb90590d87f7e38777602808 (diff)
downloadfreeipa-56f8e200131a0972e03b15c3cc3ae1dc30bf09b0.tar.gz
freeipa-56f8e200131a0972e03b15c3cc3ae1dc30bf09b0.tar.xz
freeipa-56f8e200131a0972e03b15c3cc3ae1dc30bf09b0.zip
DS uninstall: fix serverid missing in state restore
During uninstallation, we're using serverid which we get from sysrestore.state. This was not set in the newer install, return it back. Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
-rw-r--r--ipaserver/install/dsinstance.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 19b498c0a..41b767b24 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -551,6 +551,9 @@ class DsInstance(service.Service):
)
def __create_instance(self):
+ self.backup_state("serverid", self.serverid)
+ self.fstore.backup_file(paths.SYSCONFIG_DIRSRV)
+
# The new installer is api driven. We can pass it a log function
# and it will use it. Because of this, we can pass verbose true,
# and allow our logger to control the display based on level.
@@ -1091,7 +1094,7 @@ class DsInstance(service.Service):
"need to remove instance data manually")
else:
- logger.error("Failed to remove DS instance. No serverid present"
+ logger.error("Failed to remove DS instance. No serverid present "
"in sysrestore file.")
installutils.remove_keytab(paths.DS_KEYTAB)