summaryrefslogtreecommitdiffstats
path: root/ipaserver/install
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2015-05-25 09:01:42 +0200
committerJan Cholasta <jcholast@redhat.com>2015-05-26 11:30:15 +0000
commitf903c2d5bff3e420519f7bbf026b9bfcc5460fb0 (patch)
treeae08c7261394d1322af44a3439f814eaf5537bcb /ipaserver/install
parent4bcc2546d59041f0d09960d6f9d44ca68bd424e1 (diff)
downloadfreeipa-f903c2d5bff3e420519f7bbf026b9bfcc5460fb0.tar.gz
freeipa-f903c2d5bff3e420519f7bbf026b9bfcc5460fb0.tar.xz
freeipa-f903c2d5bff3e420519f7bbf026b9bfcc5460fb0.zip
Fix: use DS socket check only for upgrade
To detect if DS server is running, use the slapd socket for upgrade, and the LDAP port for installation. Without enabled LDAPi socket checking doesnt work. https://fedorahosted.org/freeipa/ticket/4904 Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
Diffstat (limited to 'ipaserver/install')
-rw-r--r--ipaserver/install/upgradeinstance.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py
index d58c934bc..10f7c2ce0 100644
--- a/ipaserver/install/upgradeinstance.py
+++ b/ipaserver/install/upgradeinstance.py
@@ -24,6 +24,7 @@ import shutil
import random
import traceback
from ipaplatform.paths import paths
+from ipaplatform import services
from ipapython.ipa_log_manager import *
from ipapython import ipaldap
@@ -172,7 +173,7 @@ class IPAUpgrade(service.Service):
self.realm = realm_name
def __start(self):
- super(IPAUpgrade, self).start()
+ services.service(self.service_name).start(self.serverid, ldapi=True)
def __stop_instance(self):
"""Stop only the main DS instance"""