diff options
Diffstat (limited to 'ipapython')
-rw-r--r-- | ipapython/platform/base.py | 6 | ||||
-rw-r--r-- | ipapython/platform/fedora16.py | 5 | ||||
-rw-r--r-- | ipapython/platform/fedora18.py | 7 | ||||
-rw-r--r-- | ipapython/platform/redhat.py | 5 |
4 files changed, 18 insertions, 5 deletions
diff --git a/ipapython/platform/base.py b/ipapython/platform/base.py index 41a9c83e7..e2aa33faf 100644 --- a/ipapython/platform/base.py +++ b/ipapython/platform/base.py @@ -27,7 +27,11 @@ import os wellknownservices = ['certmonger', 'dirsrv', 'httpd', 'ipa', 'krb5kdc', 'messagebus', 'nslcd', 'nscd', 'ntpd', 'portmap', 'rpcbind', 'kadmin', 'sshd', 'autofs', 'rpcgssd', - 'rpcidmapd', 'pki_tomcatd', 'pki-cad'] + 'rpcidmapd', 'pki_tomcatd', 'pki-cad', 'chronyd'] + +# System may support more time&date services. FreeIPA supports ntpd only, other +# services will be disabled during IPA installation +timedate_services = ['ntpd', 'chronyd'] # The common ports for these services. This is used to wait for the diff --git a/ipapython/platform/fedora16.py b/ipapython/platform/fedora16.py index 8609e4c4b..628cad13d 100644 --- a/ipapython/platform/fedora16.py +++ b/ipapython/platform/fedora16.py @@ -44,7 +44,10 @@ from ipalib import api # and restorecon is installed. __all__ = ['authconfig', 'service', 'knownservices', 'backup_and_replace_hostname', 'restore_context', 'check_selinux_status', - 'restore_network_configuration'] + 'restore_network_configuration', 'timedate_services'] + +# Just copy a referential list of timedate services +timedate_services = list(base.timedate_services) # For beginning just remap names to add .service # As more services will migrate to systemd, unit names will deviate and diff --git a/ipapython/platform/fedora18.py b/ipapython/platform/fedora18.py index c6d32866f..d12bdcad5 100644 --- a/ipapython/platform/fedora18.py +++ b/ipapython/platform/fedora18.py @@ -23,7 +23,7 @@ import socket import os from ipapython import ipautil -from ipapython.platform import fedora16 +from ipapython.platform import fedora16, base # All what we allow exporting directly from this module # Everything else is made available through these symbols when they are @@ -44,7 +44,10 @@ from ipapython.platform import fedora16 # and restorecon is installed. __all__ = ['authconfig', 'service', 'knownservices', 'backup_and_replace_hostname', 'restore_context', 'check_selinux_status', - 'restore_network_configuration'] + 'restore_network_configuration', 'timedate_services'] + +# Just copy a referential list of timedate services +timedate_services = list(base.timedate_services) def backup_and_replace_hostname(fstore, statestore, hostname): old_hostname = socket.gethostname() diff --git a/ipapython/platform/redhat.py b/ipapython/platform/redhat.py index 389785c7b..274062e46 100644 --- a/ipapython/platform/redhat.py +++ b/ipapython/platform/redhat.py @@ -52,7 +52,10 @@ from ipalib import api # and restorecon is installed. __all__ = ['authconfig', 'service', 'knownservices', 'backup_and_replace_hostname', 'restore_context', 'check_selinux_status', - 'restore_network_configuration'] + 'restore_network_configuration', 'timedate_services'] + +# Just copy a referential list of timedate services +timedate_services = list(base.timedate_services) class RedHatService(base.PlatformService): def __wait_for_open_ports(self, instance_name=""): |