diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-08-10 10:53:28 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-08-10 15:03:54 +0200 |
| commit | 609abd5e30cbf84a7a23bc025e89df45222333f9 (patch) | |
| tree | 516cdbe8476826f7eef56bdb6efe758dd06d0945 /ipaserver/install/server/upgrade.py | |
| parent | dcd8a154e64ac40273cf0d1f7c3e3478856c52ad (diff) | |
| download | freeipa-609abd5e30cbf84a7a23bc025e89df45222333f9.tar.gz freeipa-609abd5e30cbf84a7a23bc025e89df45222333f9.tar.xz freeipa-609abd5e30cbf84a7a23bc025e89df45222333f9.zip | |
Fix upgrade of sidgen and extdom plugins
If configuration entries already exist, upgrade will not add them
again.
https://fedorahosted.org/freeipa/ticket/5151
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipaserver/install/server/upgrade.py')
| -rw-r--r-- | ipaserver/install/server/upgrade.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index f295655dc..037127918 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -1261,11 +1261,11 @@ def ds_enable_sidgen_extdom_plugins(ds): root_logger.info('[Enable sidgen and extdom plugins by default]') if sysupgrade.get_upgrade_state('ds', 'enable_ds_sidgen_extdom_plugins'): - root_logger.info('sidgen and extdom plugins are enabled already') + root_logger.debug('sidgen and extdom plugins are enabled already') return - ds._add_sidgen_plugin() - ds._add_extdom_plugin() + ds.add_sidgen_plugin() + ds.add_extdom_plugin() sysupgrade.set_upgrade_state('ds', 'enable_ds_sidgen_extdom_plugins', True) def ca_upgrade_schema(ca): @@ -1415,7 +1415,10 @@ def upgrade_configuration(): ds.fqdn = fqdn ds.realm = api.env.realm ds.suffix = ipautil.realm_to_suffix(api.env.realm) + + ds.ldap_connect() ds_enable_sidgen_extdom_plugins(ds) + ds.ldap_disconnect() # Now 389-ds is available, run the remaining http tasks if not http.is_kdcproxy_configured(): |