pgreco / rpms / ipa

Forked from forks/areguera/rpms/ipa 4 years ago
Clone
51e719
From 99efecaf87dc1fc9517efaff441a6a7ce46444eb Mon Sep 17 00:00:00 2001
51e719
From: Jim Perrin <jperrin@centos.org>
51e719
Date: Wed, 11 Mar 2015 10:37:03 -0500
51e719
Subject: [PATCH] update for new ntp server method
51e719
51e719
---
51e719
 ipaplatform/base/paths.py        | 1 +
51e719
 ipaserver/install/ntpinstance.py | 2 ++
51e719
 2 files changed, 3 insertions(+)
51e719
51e719
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
51e719
index af50262..5090062 100644
51e719
--- a/ipaplatform/base/paths.py
51e719
+++ b/ipaplatform/base/paths.py
51e719
@@ -99,6 +99,7 @@ class BasePathNamespace(object):
51e719
     PKI_TOMCAT_ALIAS_DIR = "/etc/pki/pki-tomcat/alias/"
51e719
     PKI_TOMCAT_PASSWORD_CONF = "/etc/pki/pki-tomcat/password.conf"
51e719
     ETC_REDHAT_RELEASE = "/etc/redhat-release"
51e719
+    ETC_CENTOS_RELEASE = "/etc/centos-release"
51e719
     RESOLV_CONF = "/etc/resolv.conf"
51e719
     SAMBA_KEYTAB = "/etc/samba/samba.keytab"
51e719
     SMB_CONF = "/etc/samba/smb.conf"
51e719
diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py
51e719
index c653525..4b0578b 100644
51e719
--- a/ipaserver/install/ntpinstance.py
51e719
+++ b/ipaserver/install/ntpinstance.py
51e719
@@ -44,6 +44,8 @@ class NTPInstance(service.Service):
51e719
         os = ""
51e719
         if ipautil.file_exists(paths.ETC_FEDORA_RELEASE):
51e719
             os = "fedora"
51e719
+        elif ipautil.file_exists(paths.ETC_CENTOS_RELEASE):
51e719
+            os = "centos"
51e719
         elif ipautil.file_exists(paths.ETC_REDHAT_RELEASE):
51e719
             os = "rhel"
51e719
 
51e719
-- 
51e719
1.8.3.1
51e719