Import Upstream version 4.12.4

ipaplatform/fedora_container/constants.py

@@ -3,7 +3,10 @@
 #
 """Fedora container constants
 """
-from ipaplatform.fedora.constants import FedoraConstantsNamespace
+from ipaplatform.fedora.constants import FedoraConstantsNamespace, User, Group
+
+
+__all__ = ("constants", "User", "Group")
 
 
 class FedoraContainerConstantsNamespace(FedoraConstantsNamespace):

ipaplatform/fedora_container/paths.py

@@ -20,11 +20,24 @@ class FedoraContainerPathNamespace(FedoraPathNamespace):
     NAMED_CUSTOM_OPTIONS_CONF = data(
         FedoraPathNamespace.NAMED_CUSTOM_OPTIONS_CONF
     )
+    NAMED_LOGGING_OPTIONS_CONF = data(
+        FedoraPathNamespace.NAMED_LOGGING_OPTIONS_CONF
+    )
     NSSWITCH_CONF = data(FedoraPathNamespace.NSSWITCH_CONF)
     PKI_CONFIGURATION = data(FedoraPathNamespace.PKI_CONFIGURATION)
     SAMBA_DIR = data(FedoraPathNamespace.SAMBA_DIR)
     HTTPD_IPA_WSGI_MODULES_CONF = None
     HTTPD_PASSWD_FILE_FMT = data(FedoraPathNamespace.HTTPD_PASSWD_FILE_FMT)
 
+    # In some contexts, filesystem mounts may be owned by unmapped users
+    # (e.g. "emptyDir" mounts in Kubernetes / OpenShift when using user
+    # namespaces).  This causes systemd-tmpfiles(8) to fail, as a
+    # consequence of systemd's path processing routines which reject
+    # this scenario.  Therefore we provide a way to substitute
+    # systemd-tmpfiles with a "clone" program.
+    #
+    SYSTEMD_TMPFILES = os.environ.get(
+        'IPA_TMPFILES_PROG', FedoraPathNamespace.SYSTEMD_TMPFILES)
+
 
 paths = FedoraContainerPathNamespace()

ipaplatform/fedora_container/tasks.py

@@ -13,7 +13,7 @@ logger = logging.getLogger(__name__)
 
 class FedoraContainerTaskNamespace(FedoraTaskNamespace):
     def modify_nsswitch_pam_stack(
-        self, sssd, mkhomedir, statestore, sudo=True
+        self, sssd, mkhomedir, statestore, sudo=True, subid=False
     ):
         # freeipa-container images are preconfigured
         # authselect select sssd with-sudo --force