On 03/22/2013 05:10 PM, Tomas Babej wrote:
On 03/22/2013 04:51 PM, Petr Viktorin wrote:
On 03/13/2013 03:05 PM, Tomas Babej wrote:
Hi,
The following is mentioned in the server log now:
- existence of host entry (if it already does exist)
- missing krbprincipalname and its new value (if there was no
principal name set)
https://fedorahosted.org/freeipa/ticket/3481
Tomas
Here is what I get first trying to re-enroll a wiped host first using
admin username/password, and then using a saved keytab.
The first succeeded, the second didn't.
We discussed this with Petr, this is a typo and actually happend in
reversed (and correct) order :)
[Fri Mar 22 16:17:14.338411 2013] [:error] [pid 21335] ipa: INFO:
Host entry for vm-084.idm.lab.eng.brq.redhat.com already exists
[Fri Mar 22 16:17:14.367564 2013] [:error] [pid 21335] ipa: INFO:
ad...@idm.lab.eng.brq.redhat.com:
join(u'vm-084.idm.lab.eng.brq.redhat.com',
nshardwareplatform=u'x86_64', nsosversion=u'3.7.4-204.fc18.x86_64',
version=u'2.51'): SUCCESS
[Fri Mar 22 16:17:35.395626 2013] [:error] [pid 21336] ipa: INFO:
Host entry for vm-084.idm.lab.eng.brq.redhat.com already exists
[Fri Mar 22 16:17:35.420830 2013] [:error] [pid 21336] ipa: INFO:
host/vm-084.idm.lab.eng.brq.redhat....@idm.lab.eng.brq.redhat.com:
join(u'vm-084.idm.lab.eng.brq.redhat.com',
nshardwareplatform=u'x86_64', nsosversion=u'3.7.4-204.fc18.x86_64',
version=u'2.51'): SUCCESS
[Fri Mar 22 16:17:38.729304 2013] [:error] [pid 21335] ipa: INFO:
host/vm-084.idm.lab.eng.brq.redhat....@idm.lab.eng.brq.redhat.com:
host_mod(u'vm-084.idm.lab.eng.brq.redhat.com', random=False,
ipasshpubkey=([...], [...]), rights=False, updatedns=False,
all=False, raw=False, version=u'2.54'): SUCCESS
[Fri Mar 22 16:17:41.763080 2013] [:error] [pid 21336] ipa: INFO:
host/vm-084.idm.lab.eng.brq.redhat....@idm.lab.eng.brq.redhat.com:
cert_request([...],
principal=u'host/vm-084.idm.lab.eng.brq.redhat....@idm.lab.eng.brq.redhat.com',
add=True, version=u'2.51'): SUCCESS
I can see what's going on, but I don't think the admin would be much
wiser seeing this.
Would we want so say something like "Host entry for X already exists;
joining may fail on the client side" to explain what's going on?
I agree with the proposal. Sending updated patch, here's the diff:
diff --git a/ipaserver/plugins/join.py b/ipaserver/plugins/join.py
index 86d6674..3b66805 100644
--- a/ipaserver/plugins/join.py
+++ b/ipaserver/plugins/join.py
@@ -101,7 +101,9 @@ class join(Command):
dn = attrs_list['dn']
# No error raised so far means that host entry exists
- self.log.info('Host entry for %s already exists', hostname)
+ self.log.info('Host entry for %s already exists, '
+ 'joining may fail on the client side '
+ 'if not forced', hostname)
# If no principal name is set yet we need to try to add
# one.
ACK from a technical perspective.
Attached.
Tomas
I sent the wrong patch (the previous one) last time. Sorry for the
confusion.
Tomas
>From 55fe90af3452f77f7dcf4fe98ecb974340d2565f Mon Sep 17 00:00:00 2001
From: Tomas Babej <tba...@redhat.com>
Date: Wed, 13 Mar 2013 14:47:03 +0100
Subject: [PATCH] Add logging to join command
The following is mentioned in the log now:
- existence of host entry (if it already does exist)
- missing krbprincipalname and its new value (if there was no
principal name set)
https://fedorahosted.org/freeipa/ticket/3481
---
ipaserver/plugins/join.py | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/ipaserver/plugins/join.py b/ipaserver/plugins/join.py
index 6ea02b2e1b7105c7865602c601f11231dd2b64b1..3b668053c5d275c53da0c897fb4f82442a725564 100644
--- a/ipaserver/plugins/join.py
+++ b/ipaserver/plugins/join.py
@@ -23,12 +23,13 @@ Joining an IPA domain
import krbV
-from ipalib import api, util
+from ipalib import api
from ipalib import Command, Str
from ipalib import errors
from ipalib import _
from ipaserver.install import installutils
+
def get_realm():
"""
Returns the default kerberos realm configured for this server.
@@ -37,6 +38,7 @@ def get_realm():
return unicode(krbctx.default_realm)
+
def validate_host(ugettext, cn):
"""
Require at least one dot in the hostname (to support localhost.localdomain)
@@ -46,6 +48,7 @@ def validate_host(ugettext, cn):
return 'Fully-qualified hostname required'
return None
+
class join(Command):
"""Join an IPA domain"""
@@ -59,7 +62,8 @@ class join(Command):
#normalizer=lamda value: value.lower(),
),
)
- takes_options= (
+
+ takes_options = (
Str('realm',
doc=_("The IPA realm"),
default_from=lambda: get_realm(),
@@ -90,33 +94,43 @@ class join(Command):
assert 'cn' not in kw
ldap = self.api.Backend.ldap2
- host = None
try:
# First see if the host exists
kw = {'fqdn': hostname, 'all': True}
attrs_list = api.Command['host_show'](**kw)['result']
dn = attrs_list['dn']
+ # No error raised so far means that host entry exists
+ self.log.info('Host entry for %s already exists, '
+ 'joining may fail on the client side '
+ 'if not forced', hostname)
+
# If no principal name is set yet we need to try to add
# one.
if 'krbprincipalname' not in attrs_list:
service = "host/%s@%s" % (hostname, api.env.realm)
api.Command['host_mod'](hostname, krbprincipalname=service)
+ self.log.info('No principal set, setting to %s', service)
# It exists, can we write the password attributes?
allowed = ldap.can_write(dn, 'krblastpwdchange')
if not allowed:
- raise errors.ACIError(info=_("Insufficient 'write' privilege to the 'krbLastPwdChange' attribute of entry '%s'.") % dn)
+ raise errors.ACIError(info=_("Insufficient 'write' privilege "
+ "to the 'krbLastPwdChange' attribute of entry '%s'.") % dn)
+ # Reload the attrs_list and dn so that we return update values
kw = {'fqdn': hostname, 'all': True}
attrs_list = api.Command['host_show'](**kw)['result']
dn = attrs_list['dn']
+
except errors.NotFound:
- attrs_list = api.Command['host_add'](hostname, force=True)['result']
+ attrs_list = api.Command['host_add'](hostname,
+ force=True)['result']
dn = attrs_list['dn']
config = api.Command['config_show']()['result']
- attrs_list['ipacertificatesubjectbase'] = config['ipacertificatesubjectbase']
+ attrs_list['ipacertificatesubjectbase'] =\
+ config['ipacertificatesubjectbase']
return (dn, attrs_list)
--
1.7.11.7
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel