Use curl exclusively in vSphere deployment #2311
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -50,7 +50,5 @@ EOF | |||
| # | |||
| # -M installs the master | |||
| set +x | |||
| wget -q -O - https://bootstrap.saltstack.com | sh -s -- -M -X | |||
| curl -L --connect-timeout 20 --retry 6 --retry-delay 10 http://bootstrap.saltstack.com | sh -s -- -M -X | |||
There was a problem hiding this comment.
Are you sure you want to stop doing TLS here?
There was a problem hiding this comment.
Ah, I didn't notice, I copied these lines from the GCE scripts. Maybe you want to update them there as well then ;)
I'll amend and force push.
There was a problem hiding this comment.
Nevermind, was checking an older version of those scripts.
pietern
force-pushed
the
vsphere-curl
branch
from
23802f9 to
1df6f9c
Compare
jbeda
added a commit
that referenced
this pull request
Nov 12, 2014
Use curl exclusively in vSphere deployment
|
Thanks Pieter! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #2295.
I also removed the superfluous
MASTER_HTPASSWDline in the salt master template, since that is now generated in the salt overlay tree.