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

[2017.7] Removing unused salt.crypt imports #51655

Merged

Conversation

@garethgreenaway
Copy link
Member

commented Feb 14, 2019

What does this PR do?

Removing unused salt.crypt imports which are causing salt-master to not start and salt-key to now work when using openssl 1.1.1-1 and tornado >= 5.0.

What issues does this PR fix or reference?

#49661

Previous Behavior

salt-master wouldn't start up if openssl 1.1.1-1 was installed and tornado >= 5.0.
salt-key would produce a crypt SSL error.

New Behavior

salt-master starts as expected and salt-key works as expected.

Tests written?

No

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

… using openssl 1.1.1-1.
@garethgreenaway garethgreenaway requested a review from saltstack/team-core Feb 14, 2019
@Ch3LL
Ch3LL approved these changes Feb 14, 2019
…t-key to break.
@garethgreenaway garethgreenaway changed the title [2017.7] Removing unused import [2017.7] Removing unused salt.crypt imports Feb 14, 2019
… use the defaults.
@garethgreenaway garethgreenaway requested review from dwoz, thatch45 and msteed Feb 15, 2019
@msteed
msteed approved these changes Feb 15, 2019
@dwoz
dwoz approved these changes Feb 15, 2019
Copy link
Contributor

left a comment

Looks good to me. :)

@dwoz dwoz merged commit ee80ce3 into saltstack:2017.7 Feb 15, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
bbinet added a commit to bbinet/salt that referenced this pull request Apr 5, 2019
This causes pepper to fail on windows because of missing libcrypto.

See also saltstack#51655 for similar salt.crypt removals
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.