diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-03-17 12:23:06 +0100 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-03-19 12:48:41 +0100 |
| commit | c3d441ae0314bd3669a75b3f33d544d9ca09d197 (patch) | |
| tree | b7c2e14b54874983f18309338b4f1c3a54290615 /ipaserver/install/upgradeinstance.py | |
| parent | 4190b1a47c709f3973913116416b9f5b8168ba28 (diff) | |
| download | freeipa-c3d441ae0314bd3669a75b3f33d544d9ca09d197.tar.gz freeipa-c3d441ae0314bd3669a75b3f33d544d9ca09d197.tar.xz freeipa-c3d441ae0314bd3669a75b3f33d544d9ca09d197.zip | |
Server Upgrade: remove --test option
As --test option is not used for developing, and it is not recommended
to test if upgrade will pass, this path removes it copmletely.
https://fedorahosted.org/freeipa/ticket/3448
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver/install/upgradeinstance.py')
| -rw-r--r-- | ipaserver/install/upgradeinstance.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index 018db87a3..2f9039dd7 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -39,11 +39,10 @@ class IPAUpgrade(service.Service): listeners and updating over ldapi. This way we know the server is quiet. """ - def __init__(self, realm_name, files=[], live_run=True, schema_files=[]): + def __init__(self, realm_name, files=[], schema_files=[]): """ realm_name: kerberos realm name, used to determine DS instance dir files: list of update files to process. If none use UPDATEDIR - live_run: boolean that defines if we are in test or live mode. """ ext = '' @@ -55,7 +54,6 @@ class IPAUpgrade(service.Service): serverid = dsinstance.realm_to_serverid(realm_name) self.filename = '%s/%s' % (paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE % serverid, DSE) self.savefilename = '%s/%s.ipa.%s' % (paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE % serverid, DSE, ext) - self.live_run = live_run self.files = files self.modified = False self.badsyntax = False @@ -124,11 +122,11 @@ class IPAUpgrade(service.Service): def __update_schema(self): self.modified = schemaupdate.update_schema( self.schema_files, - dm_password='', ldapi=True, live_run=self.live_run) or self.modified + dm_password='', ldapi=True) or self.modified def __upgrade(self): try: - ld = ldapupdate.LDAPUpdate(dm_password='', ldapi=True, live_run=self.live_run, plugins=True) + ld = ldapupdate.LDAPUpdate(dm_password='', ldapi=True, plugins=True) if len(self.files) == 0: self.files = ld.get_all_files(ldapupdate.UPDATES_DIR) self.modified = (ld.update(self.files) or self.modified) |