diff options
| author | Christian Heimes <cheimes@redhat.com> | 2016-11-18 15:42:23 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-24 16:30:32 +0100 |
| commit | 6409abf1a60f3548203e6607a2b157ff72af2c89 (patch) | |
| tree | 2d1c06b3fc85d91f9d4bea67162a1ab9dcdca07e /ipaserver/install/installutils.py | |
| parent | 2cbaf156045769b54150e4d4c3c1071f164a16fb (diff) | |
| download | freeipa-6409abf1a60f3548203e6607a2b157ff72af2c89.tar.gz freeipa-6409abf1a60f3548203e6607a2b157ff72af2c89.tar.xz freeipa-6409abf1a60f3548203e6607a2b157ff72af2c89.zip | |
Break ipaplatform / ipalib import cycle of hell
Here is an attempt to break the import cycle of hell between ipaplatform
and ipalib. All services now pass an ipalib.api object to
services.service(). RedHatServices.__init__() still needs to do a local
import because it initializes its wellknown service dict with service
instances.
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaserver/install/installutils.py')
| -rw-r--r-- | ipaserver/install/installutils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 9e509e461..214d42c56 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -984,7 +984,7 @@ def stopped_service(service, instance_name=""): 'the next set of commands is being executed.', service, log_instance_name) - service_obj = services.service(service) + service_obj = services.service(service, api) # Figure out if the service is running, if not, yield if not service_obj.is_running(instance_name): |