URL: https://github.com/freeipa/freeipa/pull/323
Author: mbasti-rh
Title: #323: ipactl: pass api as argument to services
Action: opened
PR body:
"""
Commit 6409abf1 removes hard dependency of ipalib in ipalatform to avoid
cyclic dependenies, this commit updates ipactl accordingly
Removes ugly warnings:
```
[root@vm-028 ~]# ipactl stop
/usr/lib/python2.7/site-packages/ipaplatform/base/services.py:193:
RuntimeWarning: RedHatService('ipa-dnskeysyncd', api=None) is deprecated.
super(SystemdService, self).__init__(service_name, api=api)
Stopping ipa-dnskeysyncd Service
/usr/lib/python2.7/site-packages/ipaplatform/base/services.py:193:
RuntimeWarning: RedHatService('ipa-otpd', api=None) is deprecated.
super(SystemdService, self).__init__(service_name, api=api)
Stopping ipa-otpd Service
/usr/lib/python2.7/site-packages/ipaplatform/base/services.py:193:
RuntimeWarning: RedHatCAService('pki-tomcatd', api=None) is deprecated.
super(SystemdService, self).__init__(service_name, api=api)
Stopping pki-tomcatd Service
/usr/lib/python2.7/site-packages/ipaplatform/base/services.py:193:
RuntimeWarning: RedHatService('ntpd', api=None) is deprecated.
super(SystemdService, self).__init__(service_name, api=api)
Stopping ntpd Service
/usr/lib/python2.7/site-packages/ipaplatform/base/services.py:193:
RuntimeWarning: RedHatService('ipa-custodia', api=None) is deprecated.
super(SystemdService, self).__init__(service_name, api=api)
Stopping ipa-custodia Service
/usr/lib/python2.7/site-packages/ipaplatform/base/services.py:193:
RuntimeWarning: RedHatService('httpd', api=None) is deprecated.
super(SystemdService, self).__init__(service_name, api=api)
Stopping httpd Service
/usr/lib/python2.7/site-packages/ipaplatform/base/services.py:193:
RuntimeWarning: RedHatService('ipa_memcached', api=None) is deprecated.
super(SystemdService, self).__init__(service_name, api=api)
Stopping ipa_memcached Service
/usr/lib/python2.7/site-packages/ipaplatform/base/services.py:193:
RuntimeWarning: RedHatService('named', api=None) is deprecated.
super(SystemdService, self).__init__(service_name, api=api)
Stopping named Service
/usr/lib/python2.7/site-packages/ipaplatform/base/services.py:193:
RuntimeWarning: RedHatService('kadmin', api=None) is deprecated.
super(SystemdService, self).__init__(service_name, api=api)
Stopping kadmin Service
/usr/lib/python2.7/site-packages/ipaplatform/base/services.py:193:
RuntimeWarning: RedHatService('krb5kdc', api=None) is deprecated.
super(SystemdService, self).__init__(service_name, api=api)
```
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/323/head:pr323
git checkout pr323
From f123ce502e333b53f0a87c5a35bb1659cc61456c Mon Sep 17 00:00:00 2001
From: Martin Basti <[email protected]>
Date: Fri, 9 Dec 2016 11:05:03 +0100
Subject: [PATCH] ipactl: pass api as argument to services
Commit 6409abf1 removes hard dependency of ipalib in ipalatform to avoid
cyclic dependenies, this commit updates ipactl accordingly
---
install/tools/ipactl | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/install/tools/ipactl b/install/tools/ipactl
index db8ff62..c34f1cb 100755
--- a/install/tools/ipactl
+++ b/install/tools/ipactl
@@ -244,7 +244,7 @@ def get_config_from_file():
def stop_services(svc_list):
for svc in svc_list:
- svc_off = services.service(svc)
+ svc_off = services.service(svc, api=api)
try:
svc_off.stop(capture_output=False)
except Exception:
@@ -303,7 +303,7 @@ def ipa_start(options):
svc_list = deduplicate(svc_list)
for svc in svc_list:
- svchandle = services.service(svc)
+ svchandle = services.service(svc, api=api)
try:
print("Starting %s Service" % svc)
svchandle.start(capture_output=get_capture_output(svc, options.debug))
@@ -343,7 +343,7 @@ def ipa_stop(options):
svc_list = deduplicate(svc_list)
for svc in reversed(svc_list):
- svchandle = services.service(svc)
+ svchandle = services.service(svc, api=api)
try:
print("Stopping %s Service" % svc)
svchandle.stop(capture_output=False)
@@ -421,7 +421,7 @@ def ipa_restart(options):
# we need to definitely stop some services
old_svc_list = deduplicate(old_svc_list)
for svc in reversed(old_svc_list):
- svchandle = services.service(svc)
+ svchandle = services.service(svc, api=api)
try:
print("Stopping %s Service" % svc)
svchandle.stop(capture_output=False)
@@ -446,7 +446,7 @@ def ipa_restart(options):
# there are services to restart
svc_list = deduplicate(svc_list)
for svc in svc_list:
- svchandle = services.service(svc)
+ svchandle = services.service(svc, api=api)
try:
print("Restarting %s Service" % svc)
svchandle.restart(capture_output=get_capture_output(svc, options.debug))
@@ -469,7 +469,7 @@ def ipa_restart(options):
# we still need to start some services
new_svc_list = deduplicate(new_svc_list)
for svc in new_svc_list:
- svchandle = services.service(svc)
+ svchandle = services.service(svc, api=api)
try:
print("Starting %s Service" % svc)
svchandle.start(capture_output=get_capture_output(svc, options.debug))
@@ -521,7 +521,7 @@ def ipa_status(options):
svc_list = deduplicate(svc_list)
for svc in svc_list:
- svchandle = services.service(svc)
+ svchandle = services.service(svc, api=api)
try:
if svchandle.is_running():
print("%s Service: RUNNING" % svc)
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
