pgreco / rpms / ipa

Forked from forks/areguera/rpms/ipa 4 years ago
Clone
Blob Blame History Raw
From 99efecaf87dc1fc9517efaff441a6a7ce46444eb Mon Sep 17 00:00:00 2001
From: Jim Perrin <jperrin@centos.org>
Date: Wed, 11 Mar 2015 10:37:03 -0500
Subject: [PATCH] update for new ntp server method

---
 ipaplatform/base/paths.py        | 1 +
 ipaserver/install/ntpinstance.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index af50262..5090062 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -99,6 +99,7 @@ class BasePathNamespace(object):
     PKI_TOMCAT_ALIAS_DIR = "/etc/pki/pki-tomcat/alias/"
     PKI_TOMCAT_PASSWORD_CONF = "/etc/pki/pki-tomcat/password.conf"
     ETC_REDHAT_RELEASE = "/etc/redhat-release"
+    ETC_CENTOS_RELEASE = "/etc/centos-release"
     RESOLV_CONF = "/etc/resolv.conf"
     SAMBA_KEYTAB = "/etc/samba/samba.keytab"
     SMB_CONF = "/etc/samba/smb.conf"
diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py
index c653525..4b0578b 100644
--- a/ipaserver/install/ntpinstance.py
+++ b/ipaserver/install/ntpinstance.py
@@ -44,6 +44,8 @@ class NTPInstance(service.Service):
         os = ""
         if ipautil.file_exists(paths.ETC_FEDORA_RELEASE):
             os = "fedora"
+        elif ipautil.file_exists(paths.ETC_CENTOS_RELEASE):
+            os = "centos"
         elif ipautil.file_exists(paths.ETC_REDHAT_RELEASE):
             os = "rhel"
 
-- 
1.8.3.1