Commit ad48f550 authored by Nicolas Wavrant's avatar Nicolas Wavrant

pbs: ssh shouldn't blindly connect to host

parent fe29acc7
...@@ -258,9 +258,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback): ...@@ -258,9 +258,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
# Create the rdiff-backup wrapper # Create the rdiff-backup wrapper
# It is useful to separate it from the notifier so that we can run it manually. # It is useful to separate it from the notifier so that we can run it manually.
# XXX use -y because the host might not yet be in the remote_schema = '{ssh} -o "ConnectTimeout 300" -p %s {username}@{hostname}'.format(
# trusted hosts file until the next time slapgrid is run.
remote_schema = '{ssh} -y -o "ConnectTimeout 300" -p %s {username}@{hostname}'.format(
ssh=self.options['sshclient-binary'], ssh=self.options['sshclient-binary'],
username=parsed_url.username, username=parsed_url.username,
hostname=parsed_url.hostname hostname=parsed_url.hostname
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment