Imported Debian patch 4.7.2-3

ipaplatform/rhel/constants.py

@@ -10,17 +10,10 @@ This RHEL base platform module exports platform related constants.
 from __future__ import absolute_import
 
 from ipaplatform.redhat.constants import RedHatConstantsNamespace
-from ipaplatform.osinfo import osinfo
-
-# RHEL 7 and earlier use /etc/sysconfig/nfs
-# RHEL 8 uses /etc/nfs.conf
-HAS_NFS_CONF = osinfo.version_number >= (8,)
 
 
 class RHELConstantsNamespace(RedHatConstantsNamespace):
     IPA_ADTRUST_PACKAGE_NAME = "ipa-server-trust-ad"
     IPA_DNS_PACKAGE_NAME = "ipa-server-dns"
-    if HAS_NFS_CONF:
-        SECURE_NFS_VAR = None
 
 constants = RHELConstantsNamespace()

ipaplatform/rhel/paths.py

@@ -26,12 +26,10 @@ in RHEL-based systems.
 from __future__ import absolute_import
 
 from ipaplatform.redhat.paths import RedHatPathNamespace
-from ipaplatform.rhel.constants import HAS_NFS_CONF
 
 
 class RHELPathNamespace(RedHatPathNamespace):
-    if HAS_NFS_CONF:
-        SYSCONFIG_NFS = '/etc/nfs.conf'
+    pass
 
 
 paths = RHELPathNamespace()

ipaplatform/rhel/services.py

@@ -28,7 +28,10 @@ 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
-rhel_system_units = redhat_services.redhat_system_units.copy()
+rhel_system_units = redhat_services.redhat_system_units
+
+# Service that sets domainname on RHEL is called rhel-domainname.service
+rhel_system_units['domainname'] = 'rhel-domainname.service'
 
 
 # Service classes that implement RHEL-specific behaviour
@@ -41,6 +44,8 @@ class RHELService(redhat_services.RedHatService):
 # of specified name
 
 def rhel_service_class_factory(name, api=None):
+    if name == 'domainname':
+        return RHELService(name, api)
     return redhat_services.redhat_service_class_factory(name, api)