Re: [Freeipa-devel] [PATCH] 0451 integration tests OpenSSHTransport: Expand tilde to home in, root_ssh_key_filename

2014-02-04 Thread Petr Viktorin 

On 02/05/2014 06:49 AM, Tomas Babej wrote:


On 01/14/2014 07:03 PM, Simo Sorce wrote:

On Tue, 2014-01-14 at 18:02 +0100, Petr Viktorin wrote:

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

The tilde was not expanded in the $IPA_ROOT_SSH_KEY configuration
variable, so the default (~/.ssh/id_rsa) did not work.
Here's a fix.

Looks good.
Simo.



ACK

Tomas


Thank you! Pushed to
master: 7b5124416b193ce026ff30f1968e00d8c800d881
ipa-3-3: 5741927de57be15c1907f7482f3a3f1178902395


--
Petr³

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Re: [Freeipa-devel] [PATCH] 0451 integration tests OpenSSHTransport: Expand tilde to home in, root_ssh_key_filename

2014-02-04 Thread Tomas Babej 

On 01/14/2014 07:03 PM, Simo Sorce wrote:
> On Tue, 2014-01-14 at 18:02 +0100, Petr Viktorin wrote:
>> https://fedorahosted.org/freeipa/ticket/4115
>>
>> The tilde was not expanded in the $IPA_ROOT_SSH_KEY configuration 
>> variable, so the default (~/.ssh/id_rsa) did not work.
>> Here's a fix.
> Looks good.
> Simo.
>

ACK

Tomas

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Re: [Freeipa-devel] [PATCH] 0451 integration tests OpenSSHTransport: Expand tilde to home in, root_ssh_key_filename

2014-01-14 Thread Simo Sorce 
On Tue, 2014-01-14 at 18:02 +0100, Petr Viktorin wrote:
> https://fedorahosted.org/freeipa/ticket/4115
> 
> The tilde was not expanded in the $IPA_ROOT_SSH_KEY configuration 
> variable, so the default (~/.ssh/id_rsa) did not work.
> Here's a fix.

Looks good.
Simo.

-- 
Simo Sorce * Red Hat, Inc * New York

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

[Freeipa-devel] [PATCH] 0451 integration tests OpenSSHTransport: Expand tilde to home in, root_ssh_key_filename

2014-01-14 Thread Petr Viktorin 

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

The tilde was not expanded in the $IPA_ROOT_SSH_KEY configuration 
variable, so the default (~/.ssh/id_rsa) did not work.

Here's a fix.

--
Petr³
From 78164b1a6f9fd5d247511d664f616697fef1d1ca Mon Sep 17 00:00:00 2001
From: Petr Viktorin 
Date: Tue, 14 Jan 2014 17:16:12 +0100
Subject: [PATCH] integration tests OpenSSHTransport: Expand tilde to home in
 root_ssh_key_filename

Expand paths beginning with a tilde, such as the default ~/.ssh/id_rsa,
to the home directory.

https://fedorahosted.org/freeipa/ticket/4115
---
 ipatests/test_integration/transport.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ipatests/test_integration/transport.py b/ipatests/test_integration/transport.py
index 85c01ff32ff24ba55dc0171b74f3307cd964..066feaef654b02fddadf7090968200cb85761fa7 100644
--- a/ipatests/test_integration/transport.py
+++ b/ipatests/test_integration/transport.py
@@ -284,7 +284,8 @@ def _get_ssh_argv(self):
 '-o', 'UserKnownHostsFile=%s' % known_hosts_file]
 
 if self.host.root_ssh_key_filename:
-argv.extend(['-i', self.host.root_ssh_key_filename])
+key_filename = os.path.expanduser(self.host.root_ssh_key_filename)
+argv.extend(['-i', key_filename])
 elif self.host.root_password:
 self.log.critical('Password authentication not supported')
 raise RuntimeError('Password authentication not supported')
-- 
1.8.4.2

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel