Separate state store driver and address #168
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
Contributor
Author
|
build PR |
Contributor
|
build pr |
dseevr
requested changes
Dec 12, 2017
scripts/systemtests.sh
Outdated
| --network $NETWORK_NAME \ | ||
| $PROXY_IMAGE \ | ||
| --data-store-address="etcd://$ETCD_CONTAINER_IP:2379" \ | ||
| --data-store-driver="etcd" \ |
Contributor
There was a problem hiding this comment.
fix indentation here please
scripts/systemtests.sh
Outdated
| -e NO_NETMASTER_STARTUP_CHECK=true \ | ||
| $PROXY_IMAGE \ | ||
| --data-store-address="consul://$CONSUL_CONTAINER_IP:8500" \ | ||
| --data-store-driver="consul" \ |
| if err != nil { | ||
| return err | ||
| } | ||
| if endpoint.Scheme == "consul" { |
state/etcdstatedriver.go
Outdated
| if endpoint.Scheme == "etcd" { | ||
| endpoint.Scheme = "http" | ||
| } else if endpoint.Scheme != "http" && endpoint.Scheme != "https" { | ||
| return fmt.Errorf("invalid consul URL scheme %q", endpoint.Scheme) |
In the past, the state store driver address's schema part indicates the state store driver type, however, it limits https endpoints. This commit separates the driver type and address to make it align with updated netplugin and netmaster's CLI. Signed-off-by: Wei Tie <nuaafe@gmail.com>
Contributor
Author
|
@dseevr updated |
dseevr
approved these changes
Dec 12, 2017
Contributor
|
merging because CI was verified manually |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
In the past, the state store driver address's schema part indicates
the state store driver type, however, it limits https endpoints.
This commit separates the driver type and address to make it align
with updated netplugin and netmaster's CLI.
Signed-off-by: Wei Tie nuaafe@gmail.com