Re: [Freeipa-devel] Fix ipa-replica-prepare after DNS check patches

[Martin Basti]

On 08.01.2016 12:55, David Kupka wrote:

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



ACK

Pushed to:
master: bc6543efae9bb1bf7c5e792e30b1ea396607f57e
ipa-4-3: 5e2abd332b1292504dcdcd41972db888eff7296c

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

[Freeipa-devel] Fix ipa-replica-prepare after DNS check patches

[David Kupka]

https://fedorahosted.org/freeipa/ticket/5563
--
David Kupka
From 7d8bf4809059f97ff62f4b9a73a486ed7d19d6bb Mon Sep 17 00:00:00 2001
From: David Kupka 
Date: Tue, 22 Dec 2015 13:53:41 +
Subject: [PATCH] ipa-replica-prepare: Add '--auto-reverse' and
 '--allow-zone-overlap' options

Opiton should be added to ipa-replica-prepare when it was added to
ipa-{server,replica,dns}-install but was forgotten.

https://fedorahosted.org/freeipa/ticket/5563
---
 ipaserver/install/ipa_replica_prepare.py | 5 +
 1 file changed, 5 insertions(+)

diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py
index cef0228..e9fd2d9 100644
--- a/ipaserver/install/ipa_replica_prepare.py
+++ b/ipaserver/install/ipa_replica_prepare.py
@@ -80,6 +80,11 @@ class ReplicaPrepare(admintool.AdminTool):
 parser.add_option("--no-reverse", dest="no_reverse",
 action="store_true", default=False,
 help="do not create reverse DNS zone")
+parser.add_option("--auto-reverse", dest="auto_reverse", default=False,
+action="store_true", help="create necessary DNS zones")
+parser.add_option("--allow-zone-overlap", dest="allow_zone_overlap",
+action="store_true", default=False, help="create DNS "
+"zone even if it already exists")
 parser.add_option("--no-pkinit", dest="setup_pkinit",
 action="store_false", default=True,
 help="disables pkinit setup steps")
-- 
2.5.0

From 95657910e6918e3134a20244ce3def28150ced8e Mon Sep 17 00:00:00 2001
From: David Kupka 
Date: Tue, 22 Dec 2015 14:05:57 +
Subject: [PATCH] installer: Change reverse zones question to better reflect
 reality.

https://fedorahosted.org/freeipa/ticket/5563
---
 ipaserver/install/bindinstance.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index 8daca55..3574699 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -73,7 +73,10 @@ named_conf_include_template = "include \"%(path)s\";\n"
 
 
 def create_reverse():
-return ipautil.user_input("Do you want to configure the reverse zone?", True)
+return ipautil.user_input(
+"Do you want to search for missing reverse zones?",
+True
+)
 
 def named_conf_exists():
 try:
-- 
2.5.0

From 0acf98c3eb649f4d76e0f962bbc3901813343d98 Mon Sep 17 00:00:00 2001
From: David Kupka 
Date: Fri, 8 Jan 2016 11:26:53 +
Subject: [PATCH] Fix: Use unattended parameter instead of options.unattended

Attribute 'unattended' is not always present in 'options' so function
parameter 'unattended' should be used.

https://fedorahosted.org/freeipa/ticket/5563
---
 ipaserver/install/bindinstance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index be55f6c..3d4900e 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -463,7 +463,7 @@ def check_reverse_zones(ip_addresses, reverse_zones, options, unattended,
 ipautil.check_zone_overlap(rz)
 except ValueError as e:
 msg = "Reverse zone %s will not be used: %s" % (rz, e)
-if options.unattended:
+if unattended:
 sys.exit(msg)
 else:
 root_logger.warning(msg)
-- 
2.5.0

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code