modify create defaults for pass4symmkey change #308
Merged
Conversation
This file contains hidden or 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
nwang92
reviewed
Jan 24, 2020
| splunk_hec_token = os.environ.get("SPLUNK_HEC_TOKEN", None) | ||
| splunk_password = os.environ.get("SPLUNK_PASSWORD", None) | ||
| splunk_idxc_secret = os.environ.get("SPLUNK_IDXC_SECRET", None) | ||
| splunk_idxc_pass4SymmKey = os.environ.get("SPLUNK_SHC_PASS4SYMMKEY", None) |
Contributor
There was a problem hiding this comment.
Should be SPLUNK_IDXC_PASS4SYMMKEY
Contributor
Author
There was a problem hiding this comment.
nwang92
reviewed
Jan 24, 2020
| if not splunk_idxc_secret: | ||
| os.environ["SPLUNK_IDXC_SECRET"] = random_generator() | ||
| if not splunk_idxc_pass4SymmKey: | ||
| os.environ["SPLUNK_IDXC_SECRET"] = os.environ["SPLUNK_IDXC_SECRET"] |
Contributor
There was a problem hiding this comment.
Thinking about this more, maybe this section should first check splunk_idxc_pass4SymmKey, that way when do deprecate the old variable in the splunk-ansible code, we don't need to modify this script again. Something like
if splunk_idxc_pass4SymmKey:
os.environ["SPLUNK_IDXC_PASS4SYMMKEY"] = os.environ["SPLUNK_IDXC_SECRET"] = splunk_idxc_pass4SymmKey
elif splunk_idxc_secret:
os.environ["SPLUNK_IDXC_PASS4SYMMKEY"] = os.environ["SPLUNK_IDXC_SECRET"] = splunk_idxc_secret
else:
# generate random
Contributor
Author
There was a problem hiding this comment.
Makes sense
bb03
approved these changes
Jan 24, 2020
arctan5x
approved these changes
Jan 25, 2020
nwang92
approved these changes
Jan 25, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Makes indexer and search head pass4SymmKey values match the randomly generated indexer and search head secrets in the event that neither are present. Resolves a test failure in develop as a result of a change to splunk-ansible.