Added upgrade step executed before schmema is upgraded

Class PreSchemaUpdate is executed before ldap schema update

This is required by ticket: https://fedorahosted.org/freeipa/ticket/3210

Reviewed-By: Martin Kosek <mkosek@redhat.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/ipaserver/install/ipa_ldap_updater.py b/ipaserver/install/ipa_ldap_updater.py
index e8ef2b576..fbbef142a 100644
--- a/ipaserver/install/ipa_ldap_updater.py
+++ b/ipaserver/install/ipa_ldap_updater.py
@@ -191,12 +191,6 @@ class LDAPUpdater_NonUpgrade(LDAPUpdater):
 
         modified = False
 
-        if options.update_schema:
-            modified = schemaupdate.update_schema(
-                options.schema_files,
-                dm_password=self.dirman_password,
-                live_run=not options.test) or modified
-
         ld = LDAPUpdate(
             dm_password=self.dirman_password,
             sub_dict={},
@@ -204,6 +198,14 @@ class LDAPUpdater_NonUpgrade(LDAPUpdater):
             ldapi=options.ldapi,
             plugins=options.plugins or self.run_plugins)
 
+        modified = ld.pre_schema_update(ordered=True)
+
+        if options.update_schema:
+            modified = schemaupdate.update_schema(
+                options.schema_files,
+                dm_password=self.dirman_password,
+                live_run=not options.test) or modified
+
         if not self.files:
             self.files = ld.get_all_files(UPDATES_DIR)