Imported Upstream version 4.0.5

ipaplatform/rhel/__init__.py

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

ipaplatform/rhel/constants.py

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

ipaplatform/rhel/services.py

@@ -41,21 +41,21 @@ class RHELService(redhat_services.RedHatService):
 # Function that constructs proper RHEL-specific server classes for services
 # of specified name
 
-def rhel_service_class_factory(name, api=None):
+def rhel_service_class_factory(name):
     if name == 'domainname':
-        return RHELService(name, api)
-    return redhat_services.redhat_service_class_factory(name, api)
+        return RHELService(name)
+    return redhat_services.redhat_service_class_factory(name)
 
 
 # Magicdict containing RHELService instances.
 
 class RHELServices(redhat_services.RedHatServices):
-    def service_class_factory(self, name, api=None):
-        return rhel_service_class_factory(name, api)
+    def service_class_factory(self, name):
+        return rhel_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 = rhel_service_class_factory
 knownservices = RHELServices()