/juju

state/backup: fix restore #7366

Merged
merged 2 commits into from May 19, 2017

Conversation

Reviewers

@wallyworld wallyworld

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@axw @jujubot @wallyworld
@axw
Member

axw commented May 19, 2017

Description of change

When SSHing to machines to fix their API server
addresses during restore, do not require strict host
key checking. It is unnecessary, as we do not pass
across any sensitive information.

QA steps

Run "assess_recovery" against AWS.

Documentation changes

None.

Bug reference

Fixes https://bugs.launchpad.net/juju/+bug/1691886

axw added some commits May 19, 2017

@axw
Remove *.pyc, add to gitignore
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
634e8ce
@axw
state/backup: fix restore 
When SSHing to machines to fix their API server
addresses, do not require strict host key checking.
It is unnecessary, as we do not pass across any
sensitive information.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
a575a09
state/backups/restore.go
@@ -276,10 +276,15 @@ var sshCommand = ssh.Command
// runViaSSH runs script in the remote machine with address addr.
func runViaSSH(addr string, script string) error {
- // This is taken from cmd/juju/ssh.go there is no other clear way to set user
@wallyworld

wallyworld May 19, 2017

Owner

Can we add back this comment?

@axw

axw May 19, 2017

Member

Why? ssh.Client.Command documents the argument as taking the syntax [user@]host. It shouldn't be needed.

@axw
Member

axw commented May 19, 2017

$$merge$$
@jujubot
Contributor

jujubot commented May 19, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 6a9ae3f into juju:develop May 19, 2017
1 check failed

1 check failed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment