80 lines
2.8 KiB
Diff
80 lines
2.8 KiB
Diff
From 20bb855a57080145d0d5555294381c890ef605bb Mon Sep 17 00:00:00 2001
|
|
From: Antonio Torres <antorres@redhat.com>
|
|
Date: Tue, 16 Feb 2021 16:53:24 +0100
|
|
Subject: [PATCH] ipaserver: don't ignore zonemgr option on install
|
|
|
|
Fix zonemgr option in ipaserver install being
|
|
ignored because of an incorrect condition.
|
|
|
|
Fixes: https://pagure.io/freeipa/issue/8718
|
|
Signed-off-by: Antonio Torres <antorres@redhat.com>
|
|
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
|
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
|
---
|
|
ipaserver/install/bindinstance.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
|
|
index 3b446ce76..19941cd00 100644
|
|
--- a/ipaserver/install/bindinstance.py
|
|
+++ b/ipaserver/install/bindinstance.py
|
|
@@ -355,7 +355,7 @@ def add_zone(name, zonemgr=None, dns_backup=None, ns_hostname=None,
|
|
else:
|
|
update_policy = get_dns_forward_zone_update_policy(api.env.realm)
|
|
|
|
- if zonemgr is None:
|
|
+ if not zonemgr:
|
|
zonemgr = 'hostmaster.%s' % name
|
|
|
|
if ns_hostname:
|
|
@@ -682,7 +682,7 @@ class BindInstance(service.Service):
|
|
self.forward_policy = forward_policy
|
|
self.reverse_zones = reverse_zones
|
|
|
|
- if zonemgr is not None:
|
|
+ if not zonemgr:
|
|
self.zonemgr = 'hostmaster.%s' % normalize_zone(self.domain)
|
|
else:
|
|
self.zonemgr = normalize_zonemgr(zonemgr)
|
|
--
|
|
2.29.2
|
|
|
|
From 82043e1fd052618608d3b7786473a632478795ee Mon Sep 17 00:00:00 2001
|
|
From: Antonio Torres <antorres@redhat.com>
|
|
Date: Tue, 16 Feb 2021 18:24:26 +0100
|
|
Subject: [PATCH] ipatests: check that zonemgr is set correctly during server
|
|
install
|
|
|
|
Add test to check that zonemgr is correctly
|
|
set when installing IPA server.
|
|
|
|
Related: https://pagure.io/freeipa/issue/8718
|
|
Signed-off-by: Antonio Torres <antorres@redhat.com>
|
|
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
|
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
|
---
|
|
ipatests/test_integration/test_installation.py | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py
|
|
index 6e8af024c..18c5bd243 100644
|
|
--- a/ipatests/test_integration/test_installation.py
|
|
+++ b/ipatests/test_integration/test_installation.py
|
|
@@ -1171,6 +1171,13 @@ class TestInstallMasterDNS(IntegrationTest):
|
|
extra_args=['--zonemgr', 'me@example.org'],
|
|
)
|
|
|
|
+ tasks.kinit_admin(self.master)
|
|
+ result = self.master.run_command(
|
|
+ ['ipa', 'dnszone-show', self.master.domain.name]
|
|
+ ).stdout_text
|
|
+
|
|
+ assert "Administrator e-mail address: me.example.org" in result
|
|
+
|
|
def test_server_install_lock_bind_recursion(self):
|
|
"""Test if server installer lock Bind9 recursion
|
|
|
|
--
|
|
2.29.2
|
|
|