config: allow reading teuthology config from env var location #1998
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
Allow changing the default "user" location of the teuthology configuration yaml using the (optional) TEUTHOLOGY_CONFIG environment variable. This change aids my effort to run a customized local teuthology environment. Signed-off-by: John Mulligan <phlogistonjohn@asynchrono.us>
|
Recursion error looks real and possibly related to this change. Will investigate. |
kshtsk
reviewed
Aug 26, 2024
| @@ -285,10 +284,13 @@ def set_config_attr(obj): | |||
|
|
|||
|
|
|||
| def _get_config_path(): | |||
| config_path = os.environ.get('TEUTHOLOGY_CONFIG', '~/.teuthology.yaml') | |||
| config_path = os.path.join(os.path.expanduser(config_path)) | |||
There was a problem hiding this comment.
Bad style, overriding variable.
There was a problem hiding this comment.
Also if we declare the env for the config, we should stop immediately if such file does not exists.
kshtsk
reviewed
Aug 26, 2024
| @@ -137,7 +137,6 @@ class TeuthologyConfig(YamlConfig): | |||
| objects. Currently it serves as a convenient interface to | |||
| ~/.teuthology.yaml and nothing else. | |||
| """ | |||
| yaml_path = os.path.join(os.path.expanduser('~/.teuthology.yaml')) | |||
There was a problem hiding this comment.
I guess if drop this line you have to update the comment above about "interface to ~/.teuthology.yaml and nothing else".
kshtsk
reviewed
Aug 26, 2024
| for path in (config_path, system_config_path): | ||
| if os.path.exists(path): | ||
| return path | ||
| return None |
There was a problem hiding this comment.
The idea was to always return a meaningful value, see usage of config constructor below.
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.
Allow changing the default "user" location of the teuthology configuration yaml using the (optional) TEUTHOLOGY_CONFIG environment variable. This change aids my effort to run a customized local teuthology environment.