Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 13 commits into from Jun 4, 2018

Conversation

@pengyao
Copy link
Contributor

@pengyao pengyao commented Apr 23, 2018

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 as a code owner Apr 23, 2018
Copy link
Contributor

@gtmanfred gtmanfred left a comment

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

@gtmanfred
Copy link
Contributor

@gtmanfred gtmanfred commented Apr 23, 2018

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

@@ -177,6 +177,11 @@ Specify the SSH private key file to be used for authentication.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-priv\-passwd=SSH_PRIV_PASSWD
Specify the SSH private key file's passphrase.
Copy link
Contributor

@gtmanfred gtmanfred Apr 24, 2018

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
Contributor

@rallytime rallytime commented Apr 25, 2018

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

@pengyao
Copy link
Contributor Author

@pengyao pengyao commented Apr 26, 2018

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

@rallytime
Copy link
Contributor

@rallytime rallytime commented Apr 26, 2018

@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
Contributor

@cachedout cachedout commented May 1, 2018

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

@pengyao
Copy link
Contributor Author

@pengyao pengyao commented May 3, 2018

@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
Contributor

@rallytime rallytime commented May 3, 2018

re-run py

@pengyao
Copy link
Contributor Author

@pengyao pengyao commented May 21, 2018

@rallytime merge into develop branch?

@rallytime
Copy link
Contributor

@rallytime rallytime commented May 21, 2018

@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
Contributor

@rallytime rallytime commented May 22, 2018

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
Contributor

@rallytime rallytime commented May 31, 2018

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

@pengyao
Copy link
Contributor Author

@pengyao pengyao commented Jun 4, 2018

@rallytime The addition is added to the Fluorine release notes

@rallytime
Copy link
Contributor

@rallytime rallytime commented Jun 4, 2018

@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
4 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants