summaryrefslogtreecommitdiffstats
path: root/ipaplatform
diff options
context:
space:
mode:
authorMilan KubĂ­k <mkubik@redhat.com>2015-09-25 21:09:24 +0200
committerMartin Basti <mbasti@redhat.com>2015-10-02 14:01:50 +0200
commitc22c60b87c101178e5e653cada53dfdb861d1ad0 (patch)
tree9d8154cc5082b97f965c5f385e9b5d47f4784cb2 /ipaplatform
parent14977b5d84796c02a2c2a41f78919810cce83732 (diff)
downloadfreeipa-c22c60b87c101178e5e653cada53dfdb861d1ad0.tar.gz
freeipa-c22c60b87c101178e5e653cada53dfdb861d1ad0.tar.xz
freeipa-c22c60b87c101178e5e653cada53dfdb861d1ad0.zip
ipatests: configure Network Manager not to manage resolv.conf
For the duration of the test, makes resolv.conf unmanaged. If NetworkManager is not running, nothing is changed. https://fedorahosted.org/freeipa/ticket/5331 Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaplatform')
-rw-r--r--ipaplatform/base/paths.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index 215caf90e..a272143d0 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -354,6 +354,6 @@ class BasePathNamespace(object):
DB2BAK = '/usr/sbin/db2bak'
KDCPROXY_CONFIG = '/etc/ipa/kdcproxy/kdcproxy.conf'
CERTMONGER = '/usr/sbin/certmonger'
-
+ NETWORK_MANAGER_CONFIG_DIR = '/etc/NetworkManager/conf.d'
path_namespace = BasePathNamespace