Add CONSUL_DATACENTER_NAME env #46
Conversation
bin/consul-manage
Outdated
| @@ -8,6 +8,9 @@ set -eo pipefail | |||
| preStart() { | |||
| _log "Updating consul advertise address" | |||
| sed -i "s/CONTAINERPILOT_CONSUL_IP/${CONTAINERPILOT_CONSUL_IP}/" /etc/consul/consul.hcl | |||
|
|
|||
| _log "Updating consul datacenter name" | |||
| sed -i "s/CONSUL_DATACENTER_NAME/${CONSUL_DATACENTER_NAME:-dc1}/" /etc/consul/consul.hcl | |||
There was a problem hiding this comment.
I like configuring via environment variable, I think it makes sense here. Do we even need to do anything with metadata mentioned in #23?
There was a problem hiding this comment.
The environment variable make it straightforward to manually set the datacenter and makes testing and iteration easier, but it doesn't incorporate the automatic datacenter detection that seems to be described in #23.
I can address that part of #23 if we can decide on how it would be triggered compared to the method implemented in this PR for manual DC specification.
Options seem to include:
CONSUL_DATACENTER_NAME=*AGREED UPON STATIC VALUE*is checked specifically inpreStartand triggers a metadata check if it matches. Anything but the static value would be assumed to be a manually-specified DCCONSUL_DATACENTER_AUTODETECT=tritonwould invoke triton-specific attempts to discover the current datacenter and allow for future implementations for other cloud providersCONSUL_DATACENTER_AUTODETECT=1would attempt to check different methods of discovering the current datacenter, though involve more "magic" (i.e. brittle or potentially-unexpected behavior)CONSUL_DATACENTER_AUTODETECT_TRITON=1would invoke triton-specific attempts to discover the current datacenter, establishing the pattern for other providers to user their own envs- something else?
There was a problem hiding this comment.
I agree, and the env var satisfies non-Triton use cases. I wasn't entirely set on using metadata but we could marry the two ideas for convenience.
- Use
CONSUL_DATACENTER_NAMEto manually set/force the datacenter name. - If env var isn't present AND we have
/native/usr/sbin/mdata-getthen poll metadata forsdc:datacenter_name. - Finally, use the default
dc1if none of the above conditions gave us a custom value.
There was a problem hiding this comment.
Falling back to automatic detection seems like the best option for ease-of-use, great suggestion!
I'll include the steps taken in the README so users can see how it'll work without having to dig into the source.
|
This should be ready to merge now. |
|
Breaking this out helped review but I think we can close this and merge it in with #48. Thoughts? |
|
There's an issue with #48 that's holding it up but this PR should be fine to merge on it's own. I'll add a comment there about what's pending. |
|
Confirmed new env var locally and default as well as non-default data center names are configured. |
Resolves #23
The environment variable in
local-compose.ymlis redudant with the bash default but calls out to users that it can be changed. Commenting it out is another option.Feedback appreciated.