diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-03-13 14:59:26 +0100 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-03-19 12:37:09 +0100 |
| commit | a42fcfc18bb94fbf97ec310dbb920e045b0473a5 (patch) | |
| tree | 23b640424f79a21b70c29addadfa6db58d28c720 /ipaserver | |
| parent | 0c7274ead8670951b1f07039b68014b06418024d (diff) | |
| download | freeipa-a42fcfc18bb94fbf97ec310dbb920e045b0473a5.tar.gz freeipa-a42fcfc18bb94fbf97ec310dbb920e045b0473a5.tar.xz freeipa-a42fcfc18bb94fbf97ec310dbb920e045b0473a5.zip | |
Server Upgrade: order update files by default
https://fedorahosted.org/freeipa/ticket/4904
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/ipa_ldap_updater.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/ldapupdate.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/upgradeinstance.py | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 6bf31da99..523828735 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -509,7 +509,7 @@ class DsInstance(service.Service): def apply_updates(self): ld = ldapupdate.LDAPUpdate(dm_password=self.dm_password, sub_dict=self.sub_dict, plugins=True) files = ld.get_all_files(ldapupdate.UPDATES_DIR) - ld.update(files, ordered=True) + ld.update(files) def __add_referint_module(self): self._ldap_mod("referint-conf.ldif") diff --git a/ipaserver/install/ipa_ldap_updater.py b/ipaserver/install/ipa_ldap_updater.py index 4ad7b9727..5df7cdf42 100644 --- a/ipaserver/install/ipa_ldap_updater.py +++ b/ipaserver/install/ipa_ldap_updater.py @@ -208,7 +208,7 @@ class LDAPUpdater_NonUpgrade(LDAPUpdater): if not self.files: self.files = ld.get_all_files(UPDATES_DIR) - modified = ld.update(self.files, ordered=True) or modified + modified = ld.update(self.files) or modified if modified and options.test: self.log.info('Update complete, changes to be made, test mode') diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 3e4fc3f7a..3e59a9115 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -745,7 +745,7 @@ class LDAPUpdate: for update in all_updates: self._delete_record(update) - def update(self, files, ordered=False): + def update(self, files, ordered=True): """Execute the update. files is a list of the update files to use. :param ordered: Update files are executed in alphabetical order diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index 95306fc3c..018db87a3 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -131,8 +131,7 @@ class IPAUpgrade(service.Service): ld = ldapupdate.LDAPUpdate(dm_password='', ldapi=True, live_run=self.live_run, plugins=True) if len(self.files) == 0: self.files = ld.get_all_files(ldapupdate.UPDATES_DIR) - self.modified = (ld.update(self.files, ordered=True) or - self.modified) + self.modified = (ld.update(self.files) or self.modified) except ldapupdate.BadSyntax, e: root_logger.error('Bad syntax in upgrade %s' % str(e)) self.modified = False |