Skip to content

Fix issue #38366 salt-ssh support private key's passphrase - #47238

Merged
rallytime merged 13 commits into
saltstack:developfrom
pengyao:ssh_private_key_pass
Jun 4, 2018
Merged

rallytime merged 13 commits into
saltstack:developfrom
pengyao:ssh_private_key_pass

Conversation

@pengyao

@pengyao pengyao commented Apr 23, 2018

Copy link
Copy Markdown
Contributor

What does this PR do?

Fix issue #38366

What issues does this PR fix or reference?

Support private key's passphrase for salt-ssh

Previous Behavior

Not support

New Behavior

Private key's passphrase could be configured by:

  • --priv-passwd for salt-ssh cli
  • salt_priv_passwd for salt master configure file
  • priv_passwd for salt roster file

@pengyao
pengyao requested a review from a team as a code owner April 23, 2018 08:13

@gtmanfred gtmanfred left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add docs about this config option to the salt ssh topics page?

@gtmanfred

Copy link
Copy Markdown
Contributor

Also, adding this to the release notes for Fluorine would be greatly appreciated.

Comment thread doc/man/salt-ssh.1 Outdated
.INDENT 0.0
.TP
.B \-\-priv\-passwd=SSH_PRIV_PASSWD
Specify the SSH private key file's passphrase.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove this change?

We compile these when they are packaged, it does not need to be updated.

It will be updated when packaged
@rallytime

Copy link
Copy Markdown
Contributor

This change is causing many of the ssh tests to fail. @pengyao Can you take a look?

@pengyao

pengyao commented Apr 26, 2018

Copy link
Copy Markdown
Contributor Author

@rallytime It's my fault. I have fixed it.

@rallytime

Copy link
Copy Markdown
Contributor

@pengyao Looks like one more test here needs to be addressed :)

https://jenkins.saltstack.com/job/PR/job/salt-pr-linode-ubuntu14-n/22289/

@cachedout

Copy link
Copy Markdown
Contributor

@pengyao Are you able to resolve that final failing test? We would really like to get this merged if we can. :)

@pengyao

pengyao commented May 3, 2018

Copy link
Copy Markdown
Contributor Author

@cachedout @rallytime Jenkins Error is:

No test reports found for the metric 'JUnit' with the resolved pattern 'artifacts/unittests/*.xml'. Configuration error?.

I think the error is not created by this commits

@rallytime

Copy link
Copy Markdown
Contributor

re-run py

@pengyao

pengyao commented May 21, 2018

Copy link
Copy Markdown
Contributor Author

@rallytime merge into develop branch?

@rallytime

Copy link
Copy Markdown
Contributor

@pengyao The following test is still failing:

  • unit.config.schemas.test_ssh.RosterEntryConfigTest.test_config

That will need to be fixed before we can merge this in.

https://jenkins.saltstack.com/job/PR/job/salt-pr-linode-ubuntu14-n/23028/

@rallytime

Copy link
Copy Markdown
Contributor

Thanks for fixing that @pengyao - that looks good.

I think an addition to the release notes (for Fluorine) would be good here as well. Can you add something for that? Then we can get this in :)

@rallytime

Copy link
Copy Markdown
Contributor

@pengyao We just need this added to the Fluorine release notes and then we can get this in.

@pengyao

pengyao commented Jun 4, 2018

Copy link
Copy Markdown
Contributor Author

@rallytime The addition is added to the Fluorine release notes

@rallytime

Copy link
Copy Markdown
Contributor

@pengyao Oh! You're right. I thought I double checked but I must have missed it. Thank you!

@rallytime
rallytime merged commit 250226b into saltstack:develop Jun 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants