[Freeipa-devel] [PATCH] Bypass ipa-replica-conncheck ssh tests when ssh is not installed

[Petr Viktorin]

On 08/08/2013 02:32 PM, Tomas Babej wrote:
> On 08/07/2013 09:57 PM, Nathaniel McCallum wrote:
>> In the interest of getting ticket 3777 moving, I have created the
>> attached patch. It is *NOT* tested as I don't have a replica setup at
>> the moment and won't have time until after Flock. If someone else has a
>> replica setup and has a few minutes to burn, you are welcome to test the
>> patch.
>>
>> Nathaniel
>>
>>
>> _______________________________________________
>> Freeipa-devel mailing list
>> Freeipa-devel at redhat.com
>> https://www.redhat.com/mailman/listinfo/freeipa-devel
>
> The replica installation fails with:
>
> Connection from replica to master is OK.
> Start listening on required ports for remote master check
> Get credentials to log in to remote master
> Check SSH connection to remote master
> Traceback (most recent call last):
>    File "/usr/sbin/ipa-replica-conncheck", line 418, in <module>
>      sys.exit(main())
>    File "/usr/sbin/ipa-replica-conncheck", line 392, in main
>      stdout, stderr, returncode = ssh('echo OK', verbose=True)
>    File "/usr/sbin/ipa-replica-conncheck", line 70, in __call__
>      return ipautil.run(cmd, env=env, raiseonerr=False)
>    File "/usr/lib/python2.7/site-packages/ipapython/ipautil.py", line
> 303, in run
>      close_fds=True, env=env, cwd=cwd)
>    File "/usr/lib64/python2.7/subprocess.py", line 711, in __init__
>      errread, errwrite)
>    File "/usr/lib64/python2.7/subprocess.py", line 1308, in _execute_child
>      raise child_exception
> TypeError: execve() arg 3 must be a mapping object
> Connection check failed!
> Please fix your network settings according to error messages above.
> If the check results are not valid it can be skipped with
> --skip-conncheck parameter.
>
> The culprit here is the comma after the definition of env:
>
> +        env = {'KRB5_CONFIG': KRB5_CONFIG, 'KRB5CCNAME': CCACHE_FILE},
> +        return ipautil.run(cmd, env=env, raiseonerr=False)
>
> With that fixed the patch works as expected.
>

ACK with this change and a few whitespace fixes, pushed to master and 
ipa-3-3.

master: fb95f379f0a540971212152d389457604502b029
ipa-3-3: 44d6c857cb5df8f007e82a69b89cdc300f6ad445

Moving to ipautil can happen as a separate discussion/patch.

-- 
Petr³