Imported Upstream version 4.0.5

ipaplatform/fedora/__init__.py

@@ -20,4 +20,3 @@
 '''
 This module contains Fedora specific platform files.
 '''
-NAME = 'fedora'

ipaplatform/fedora/constants.py

@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2015  FreeIPA Contributors see COPYING for license
-#
-
-'''
-This Fedora base platform module exports platform related constants.
-'''
-
-# Fallback to default constant definitions
-from ipaplatform.redhat.constants import RedHatConstantsNamespace
-
-
-class FedoraConstantsNamespace(RedHatConstantsNamespace):
-    pass
-
-constants = FedoraConstantsNamespace()

ipaplatform/fedora/services.py

@@ -26,7 +26,7 @@ from ipaplatform.redhat import services as redhat_services
 
 # Mappings from service names as FreeIPA code references to these services
 # to their actual systemd service names
-fedora_system_units = redhat_services.redhat_system_units.copy()
+fedora_system_units = redhat_services.redhat_system_units
 
 # Service that sets domainname on Fedora is called fedora-domainname.service
 fedora_system_units['domainname'] = 'fedora-domainname.service'
@@ -41,21 +41,21 @@ class FedoraService(redhat_services.RedHatService):
 # Function that constructs proper Fedora-specific server classes for services
 # of specified name
 
-def fedora_service_class_factory(name, api=None):
+def fedora_service_class_factory(name):
     if name == 'domainname':
-        return FedoraService(name, api)
-    return redhat_services.redhat_service_class_factory(name, api)
+        return FedoraService(name)
+    return redhat_services.redhat_service_class_factory(name)
 
 
 # Magicdict containing FedoraService instances.
 
 class FedoraServices(redhat_services.RedHatServices):
-    def service_class_factory(self, name, api=None):
-        return fedora_service_class_factory(name, api)
+    def service_class_factory(self, name):
+        return fedora_service_class_factory(name)
 
 
 # Objects below are expected to be exported by platform module
 
-timedate_services = redhat_services.timedate_services
+from ipaplatform.redhat.services import timedate_services
 service = fedora_service_class_factory
 knownservices = FedoraServices()