summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2012-12-07 16:44:32 +0100
committerRob Crittenden <rcritten@redhat.com>2012-12-07 13:07:36 -0500
commit211f6c9046ab9b43c7f40e279db7c5595ae70bd1 (patch)
treed8e666b3def0bff9e3c05e78b782841cde859465 /ipapython
parent867f7691e9e8d4dc101d227ca56a94f9b947897f (diff)
downloadfreeipa-211f6c9046ab9b43c7f40e279db7c5595ae70bd1.tar.gz
freeipa-211f6c9046ab9b43c7f40e279db7c5595ae70bd1.tar.xz
freeipa-211f6c9046ab9b43c7f40e279db7c5595ae70bd1.zip
Stop and disable conflicting time&date services
Fedora 16 introduced chrony as default client time&date synchronization service: http://fedoraproject.org/wiki/Features/ChronyDefaultNTP Thus, there may be people already using chrony as their time and date synchronization service before installing IPA. However, installing IPA server or client on such machine may lead to unexpected behavior, as the IPA installer would configure ntpd and leave the machine with both ntpd and chronyd enabled. However, since the OS does not allow both chronyd and ntpd to be running concurrently and chronyd has the precedence, ntpd would not be run on that system at all. Make sure, that user is warned when trying to install IPA on such system and is given a possibility to either not to let IPA configure ntpd at all or to let the installer stop and disable chronyd. https://fedorahosted.org/freeipa/ticket/2974
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/platform/base.py6
-rw-r--r--ipapython/platform/fedora16.py5
-rw-r--r--ipapython/platform/fedora18.py7
-rw-r--r--ipapython/platform/redhat.py5
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=""):