summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinstall/tools/ipactl10
-rw-r--r--ipapython/platform/base.py9
-rw-r--r--ipapython/platform/systemd.py12
3 files changed, 25 insertions, 6 deletions
diff --git a/install/tools/ipactl b/install/tools/ipactl
index e8f3f6384..c2f13c256 100755
--- a/install/tools/ipactl
+++ b/install/tools/ipactl
@@ -420,7 +420,10 @@ def ipa_status(options):
try:
svc_list = get_config_from_file()
except IpactlError, e:
- raise e
+ if os.path.exists(ipaservices.get_svc_list_file()):
+ raise e
+ else:
+ svc_list = []
except Exception, e:
raise IpactlError("Failed to get list of services to probe status: " + str(e))
@@ -430,6 +433,9 @@ def ipa_status(options):
print "Directory Service: RUNNING"
else:
print "Directory Service: STOPPED"
+ if len(svc_list) == 0:
+ print ("Directory Service must be running in order to " +
+ "obtain status of other services")
except:
raise IpactlError("Failed to get Directory Service status")
@@ -473,7 +479,7 @@ def main():
else:
raise e
- api.bootstrap(context='cli', debug=options.debug)
+ api.bootstrap(context='ipactl', debug=options.debug)
api.finalize()
if '.' not in api.env.host:
diff --git a/ipapython/platform/base.py b/ipapython/platform/base.py
index 8385e1038..41a9c83e7 100644
--- a/ipapython/platform/base.py
+++ b/ipapython/platform/base.py
@@ -136,12 +136,15 @@ class PlatformService(object):
def __init__(self, service_name):
self.service_name = service_name
- def start(self, instance_name="", capture_output=True, wait=True):
+ def start(self, instance_name="", capture_output=True, wait=True,
+ update_service_list=True):
"""
When a service is started record the fact in a special file.
This allows ipactl stop to always stop all services that have
been started via ipa tools
"""
+ if not update_service_list:
+ return
svc_list = []
try:
f = open(SVC_LIST_FILE, 'r')
@@ -159,10 +162,12 @@ class PlatformService(object):
f.close()
return
- def stop(self, instance_name="", capture_output=True):
+ def stop(self, instance_name="", capture_output=True, update_service_list=True):
"""
When a service is stopped remove it from the service list file.
"""
+ if not update_service_list:
+ return
svc_list = []
try:
f = open(SVC_LIST_FILE, 'r')
diff --git a/ipapython/platform/systemd.py b/ipapython/platform/systemd.py
index bb6c00929..4e8a03f2f 100644
--- a/ipapython/platform/systemd.py
+++ b/ipapython/platform/systemd.py
@@ -91,13 +91,21 @@ class SystemdService(base.PlatformService):
def stop(self, instance_name="", capture_output=True):
ipautil.run(["/bin/systemctl", "stop", self.service_instance(instance_name)], capture_output=capture_output)
- super(SystemdService, self).stop(instance_name)
+ if 'context' in api.env and api.env.context in ['ipactl', 'installer']:
+ update_service_list = True
+ else:
+ update_service_list = False
+ super(SystemdService, self).stop(instance_name,update_service_list=update_service_list)
def start(self, instance_name="", capture_output=True, wait=True):
ipautil.run(["/bin/systemctl", "start", self.service_instance(instance_name)], capture_output=capture_output)
+ if 'context' in api.env and api.env.context in ['ipactl', 'installer']:
+ update_service_list = True
+ else:
+ update_service_list = False
if wait and self.is_running(instance_name):
self.__wait_for_open_ports(self.service_instance(instance_name))
- super(SystemdService, self).start(instance_name)
+ super(SystemdService, self).start(instance_name, update_service_list=update_service_list)
def restart(self, instance_name="", capture_output=True, wait=True):
# Restart command is broken before systemd-36-3.fc16