Read etcd data dir from appropriate config file. #850
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
| @@ -558,17 +597,17 @@ def set_deployment_facts_if_unset(facts): | |||
| service_type = 'atomic-openshift' | |||
| if deployment_type == 'origin': | |||
| service_type = 'origin' | |||
| elif deployment_type in ['enterprise', 'online']: | |||
| elif deployment_type in ['openshift-enterprise', 'enterprise', 'online']: | |||
There was a problem hiding this comment.
These conditionals are for 3.0 deployments, we want the atomic-openshift service type for openshift-enterprise.
Likewise for /etc/origin and /var/lib/origin
There was a problem hiding this comment.
Can you clarify, these three lines should revert, and we leave it with "origin" dirs if openshift-enterprise or atomic-enterprise? Do I have that right?
There was a problem hiding this comment.
My mistake, thanks! Updated.
|
Outside of the comment around the deployment_type facts, lgtm |
Rather than assuming the etcd data dir, we now read if from master-config.yaml if using embedded etcd, otherwise from etcd.conf. Doing so now required use of PyYAML to parse config file when gathering facts. Fixed discrepancy with data_dir fact and openshift-enterprise deployment_type.
|
👍 |
brenton
added a commit
that referenced
this pull request
Nov 9, 2015
Read etcd data dir from appropriate config file.
|
FWIW, I confirmed PyYAML is available on Atomic Host. |
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.
Rather than assuming the etcd data dir, we now read if from master-config.yaml
if using embedded etcd, otherwise from etcd.conf.
Doing so now required use of PyYAML to parse config file when gathering facts.
Fixed discrepancy with data_dir fact and openshift-enterprise deployment_type.