URL: https://github.com/freeipa/freeipa/pull/2506
Author: tiran
 Title: #2506: [Backport][ipa-4-7] Display succesful install message when 
ipa-replica-install completes
Action: opened

PR body:
"""
This PR was opened automatically because PR #2503 was pushed to master and 
backport to ipa-4-7 is required.
"""

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/2506/head:pr2506
git checkout pr2506
From 85650cdbfd1140a68aa60b5582282dccffc38697 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcrit...@redhat.com>
Date: Tue, 30 Oct 2018 17:30:16 -0400
Subject: [PATCH 1/3] Pass a list of values into add_master_dns_records

During replica installation the local IP addresses should be
added to DNS but will fail because a string is being passed
to an argument expecting a list. Convert to a list before
passing in individual IPs.

Discovered when fixing https://pagure.io/freeipa/issue/7408

Signed-off-by: Rob Crittenden <rcrit...@redhat.com>
---
 ipaserver/install/server/replicainstall.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index 30220578d4..2e81498f56 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -181,7 +181,7 @@ def install_dns_records(config, options, remote_api, fstore=None):
             reverse_zone = bindinstance.find_reverse_zone(ip, remote_api)
 
             bind.add_master_dns_records(config.host_name,
-                                        str(ip),
+                                        [str(ip)],
                                         config.realm_name,
                                         config.domain_name,
                                         reverse_zone)

From 4ff9a6fa4b3500da29ce81fe7a0e5ded052759b5 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcrit...@redhat.com>
Date: Tue, 30 Oct 2018 17:31:42 -0400
Subject: [PATCH 2/3] Demote log message in custodia _wait_keys to debug

This was previously suppressed because of the log level in
an installation was set to error so it was never displayed
Keeping consistency and demoting it to debug since the
log level is increased to info.

Related: https://pagure.io/freeipa/issue/7408

Signed-off-by: Rob Crittenden <rcrit...@redhat.com>
---
 ipaserver/install/custodiainstance.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipaserver/install/custodiainstance.py b/ipaserver/install/custodiainstance.py
index 907d3edd14..9210890357 100644
--- a/ipaserver/install/custodiainstance.py
+++ b/ipaserver/install/custodiainstance.py
@@ -213,8 +213,8 @@ def import_dm_password(self):
     def _wait_keys(self):
         timeout = api.env.replication_wait_timeout
         deadline = int(time.time()) + timeout
-        logger.info("Waiting up to %s seconds to see our keys "
-                    "appear on host %s", timeout, self.ldap_uri)
+        logger.debug("Waiting up to %s seconds to see our keys "
+                     "appear on host %s", timeout, self.ldap_uri)
 
         konn = KEMLdap(self.ldap_uri)
         saved_e = None

From afdee3cd97e308bbd8adc8f49cbd0845983b99c5 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcrit...@redhat.com>
Date: Tue, 30 Oct 2018 17:33:02 -0400
Subject: [PATCH 3/3] Enable replica install info logging to match
 ipa-server-install

Increase log level to info by setting verbose=True and adding
a console format.

Signed-off-by: Rob Crittenden <rcrit...@redhat.com>

https://pagure.io/freeipa/issue/7408
---
 ipaserver/install/ipa_replica_install.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ipaserver/install/ipa_replica_install.py b/ipaserver/install/ipa_replica_install.py
index d66b9392d1..3953cda05b 100644
--- a/ipaserver/install/ipa_replica_install.py
+++ b/ipaserver/install/ipa_replica_install.py
@@ -81,7 +81,9 @@ def host_password(self):
     CompatServerReplicaInstall,
     command_name='ipa-replica-install',
     log_file_name=paths.IPAREPLICA_INSTALL_LOG,
+    console_format='%(message)s',
     debug_option=True,
+    verbose=True,
 )
 
 
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org

Reply via email to