diff options
| author | Oleg Fayans <ofayans@redhat.com> | 2016-01-14 14:59:37 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-01-19 17:47:23 +0100 |
| commit | 7a742391c1558680900bcb130bbf3fe6790fc573 (patch) | |
| tree | f37f2de86706bb24de7a4c07102a66fe653e3dd3 | |
| parent | ddf2c813b453a85c22dbf278a575d3c6406b4471 (diff) | |
| download | freeipa-7a742391c1558680900bcb130bbf3fe6790fc573.tar.gz freeipa-7a742391c1558680900bcb130bbf3fe6790fc573.tar.xz freeipa-7a742391c1558680900bcb130bbf3fe6790fc573.zip | |
fixed an issue with master installation not creating reverse zone
When resolv.conf is set to point to the master's ip before installation, the
ipa-server-install does not create a reverse zone for it's ip even despite
--auto-reverse option provided. The fix is not to mess around with resolv.conf
before master installation.
Reviewed-By: Petr Spacek <pspacek@redhat.com>
| -rw-r--r-- | ipatests/test_integration/tasks.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index 6fdcf9a90..a1d6cb88a 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -88,11 +88,12 @@ def allow_sync_ptr(host): raiseonerr=False) -def apply_common_fixes(host): +def apply_common_fixes(host, fix_resolv=True): fix_etc_hosts(host) fix_hostname(host) modify_nm_resolv_conf_settings(host) - fix_resolv_conf(host) + if fix_resolv: + fix_resolv_conf(host) def backup_file(host, filename): @@ -264,7 +265,7 @@ def install_master(host, setup_dns=True, setup_kra=False): host.collect_log(paths.SLAPD_INSTANCE_ERROR_LOG_TEMPLATE % inst) host.collect_log(paths.SLAPD_INSTANCE_ACCESS_LOG_TEMPLATE % inst) - apply_common_fixes(host) + apply_common_fixes(host, fix_resolv=False) fix_apache_semaphores(host) args = [ |