ipaplatform: Move all filesystem paths to ipaplatform.paths module

https://fedorahosted.org/freeipa/ticket/4052

Reviewed-By: Petr Viktorin <pviktori@redhat.com>

2 files changed, 7 insertions, 5 deletions

diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py
index d5004c6bf..1e084dba1 100644
--- a/ipa-client/ipaclient/ipadiscovery.py
+++ b/ipa-client/ipaclient/ipadiscovery.py
@@ -26,6 +26,7 @@ from dns import resolver, rdatatype
 from dns.exception import DNSException
 from ipalib import errors
 from ipapython import ipaldap
+from ipaplatform.paths import paths
 from ipapython.ipautil import valid_ip, get_ipa_basedn, realm_to_suffix
 from ipapython.dn import DN
 
@@ -75,7 +76,7 @@ class IPADiscovery(object):
         domains = []
         domain = None
         try:
-            fp = open('/etc/resolv.conf', 'r')
+            fp = open(paths.RESOLV_CONF, 'r')
             lines = fp.readlines()
             fp.close()
 
diff --git a/ipa-client/ipaclient/ntpconf.py b/ipa-client/ipaclient/ntpconf.py
index c01dea09c..ca97ec45e 100644
--- a/ipa-client/ipaclient/ntpconf.py
+++ b/ipa-client/ipaclient/ntpconf.py
@@ -22,6 +22,7 @@ import shutil
 import os
 from ipaplatform.tasks import tasks
 from ipaplatform import services
+from ipaplatform.paths import paths
 
 ntp_conf = """# Permit time synchronization with our time source, but do not
 # permit the source to query or modify the service on this system.
@@ -96,9 +97,9 @@ def __write_config(path, content):
     fd.close()
 
 def config_ntp(server_fqdn, fstore = None, sysstore = None):
-    path_step_tickers = "/etc/ntp/step-tickers"
-    path_ntp_conf = "/etc/ntp.conf"
-    path_ntp_sysconfig = "/etc/sysconfig/ntpd"
+    path_step_tickers = paths.NTP_STEP_TICKERS
+    path_ntp_conf = paths.NTP_CONF
+    path_ntp_sysconfig = paths.SYSCONFIG_NTPD
     sub_dict = { }
     sub_dict["SERVER"] = server_fqdn
 
@@ -142,7 +143,7 @@ def synconce_ntp(server_fqdn):
 
     Returns True if sync was successful
     """
-    ntpd = '/usr/sbin/ntpd'
+    ntpd = paths.NTPD
     if not os.path.exists(ntpd):
         return False