This repository has been archived by the owner on Oct 22, 2019. It is now read-only.
Fix multiple prefix support in libcalico #151
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
nelljerram
reviewed
Oct 6, 2016
| @@ -298,6 +298,18 @@ def ensure_global_config(self): | |||
| # We are always ready. | |||
| self.etcd_client.write(CALICO_V_PATH + "/Ready", "true") | |||
|
|
|||
| def _ensure_interface_prefix(self): | |||
| try: | |||
| if_prefix = self.etcd_client.read(CONFIG_IF_PREF_PATH).value | |||
There was a problem hiding this comment.
Move prefixes = ... line here.
| if_prefix = self.etcd_client.read(CONFIG_IF_PREF_PATH).value | ||
| except EtcdKeyNotFound: | ||
| self.etcd_client.write(CONFIG_IF_PREF_PATH, IF_PREFIX) | ||
| return |
There was a problem hiding this comment.
Delete previous two lines, and instead put prefixes = []
ensure_global_config now appends interface prefix for calico if it is not present.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Function
ensure_global_confignow appends interface prefix for calicoif it is not present.