Fix for #4025 - st2ctl environment variables #4027
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
bigmstone
approved these changes
Mar 7, 2018
st2common/bin/st2ctl
Outdated
|
|
||
| # Ensure global environment is sourced if exists | ||
| # Does not happen consistently with all OSes we support. | ||
| [ -r /etc/environment ] && . /etc/environment | ||
|
|
||
| # load in environment to allow override of COMPONENTS and ST2_CONFIG above | ||
| # Ubuntu/Debian | ||
| [ -r /etc/default/st2ctl ] && . /etc/default/st2ctl |
There was a problem hiding this comment.
I'd like it better if we used source here just be be more explicit, but this shebang is bash so it shouldn't matter - not a blocker, just a preference.
st2common/bin/st2ctl
Outdated
| COMPONENTS="st2actionrunner st2api st2stream st2auth st2garbagecollector st2notifier st2resultstracker st2rulesengine st2sensorcontainer st2chatops mistral" | ||
| STANCONF="/etc/st2/st2.conf" | ||
| ST2_CONFIG="/etc/st2/st2.conf" |
There was a problem hiding this comment.
I was going to complain about this since we use STANCONF in other places...but we also use ST2_CONF in other places and I prefer the name ST2_CONF so, YOLO?
|
@bigmstone I just pushed a change that uses |
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 is a fix for #4025 .
It adds the ability for
st2ctlto load in environment variables from an/etc/default/st2ctl(ubuntu) or/etc/sysconfig/st2ctlfile. This allows deployments to utilize selective component lists and non-default st2.conf locations.