From a505e6e9daf163d5fdcc6c756a374773875afb65 Mon Sep 17 00:00:00 2001 From: petems Date: Sat, 2 Mar 2019 17:41:12 +0000 Subject: [PATCH] Update go-discover vendor * Adds note about use of ENV variables for auto-join on Azure --- vendor/vendor.json | 4 ++-- website/source/docs/agent/cloud-auto-join.html.md | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/vendor/vendor.json b/vendor/vendor.json index 8fa3fc1634..9f77482b35 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -105,10 +105,10 @@ {"path":"github.com/hashicorp/errwrap","checksumSHA1":"cdOCt0Yb+hdErz8NAQqayxPmRsY=","revision":"7554cd9344cec97297fa6649b055a8c98c2a1e55","revisionTime":"2014-10-28T05:47:10Z"}, {"path":"github.com/hashicorp/go-checkpoint","checksumSHA1":"D267IUMW2rcb+vNe3QU+xhfSrgY=","revision":"1545e56e46dec3bba264e41fde2c1e2aa65b5dd4","revisionTime":"2017-10-09T17:35:28Z"}, {"path":"github.com/hashicorp/go-cleanhttp","checksumSHA1":"YAq1rqZIp+M74Q+jMBQkkMKm3VM=","revision":"d5fe4b57a186c716b0e00b8c301cbd9b4182694d","revisionTime":"2017-12-18T14:54:08Z"}, - {"path":"github.com/hashicorp/go-discover","checksumSHA1":"qJN0TixDHZdaP3z110+oNszPlUg=","revision":"f9c9239562a8e21e5a37f1f2604d8f1c11bc3893","revisionTime":"2018-08-31T15:49:06Z"}, + {"path":"github.com/hashicorp/go-discover","checksumSHA1":"bE/rBu9lGlsU5KGPADI/3QxJUPc=","revision":"504b36597c3cf5f2829223bb3d2da42185e8e6ac","revisionTime":"2019-02-26T15:04:00Z"}, {"path":"github.com/hashicorp/go-discover/provider/aliyun","checksumSHA1":"Jww5zrDwjMoFF31RqBapilTdi18=","revision":"f9c9239562a8e21e5a37f1f2604d8f1c11bc3893","revisionTime":"2018-08-31T15:49:06Z","tree":true}, {"path":"github.com/hashicorp/go-discover/provider/aws","checksumSHA1":"Vit45xRjrJ6h7IGJndrBjodVUAE=","revision":"f9c9239562a8e21e5a37f1f2604d8f1c11bc3893","revisionTime":"2018-08-31T15:49:06Z","tree":true}, - {"path":"github.com/hashicorp/go-discover/provider/azure","checksumSHA1":"dMU80T10KQFZNqpBBjzf7ymFNBw=","revision":"f9c9239562a8e21e5a37f1f2604d8f1c11bc3893","revisionTime":"2018-08-31T15:49:06Z","tree":true}, + {"path":"github.com/hashicorp/go-discover/provider/azure","checksumSHA1":"RsASZQbLtb3OYyQg8G5b5feDLis=","revision":"504b36597c3cf5f2829223bb3d2da42185e8e6ac","revisionTime":"2019-02-26T15:04:00Z","tree":true}, {"path":"github.com/hashicorp/go-discover/provider/digitalocean","checksumSHA1":"TthiY6qza4DnHPLXBq7re5ngNOY=","revision":"f9c9239562a8e21e5a37f1f2604d8f1c11bc3893","revisionTime":"2018-08-31T15:49:06Z","tree":true}, {"path":"github.com/hashicorp/go-discover/provider/gce","checksumSHA1":"bQHkaF9dUFUYJLQ0MkVLIlCIVaE=","revision":"f9c9239562a8e21e5a37f1f2604d8f1c11bc3893","revisionTime":"2018-08-31T15:49:06Z","tree":true}, {"path":"github.com/hashicorp/go-discover/provider/k8s","checksumSHA1":"z2HYgfd2QRA5/ciDKgqayGb5bNw=","revision":"f9c9239562a8e21e5a37f1f2604d8f1c11bc3893","revisionTime":"2018-08-31T15:49:06Z"}, diff --git a/website/source/docs/agent/cloud-auto-join.html.md b/website/source/docs/agent/cloud-auto-join.html.md index 51f891250f..f908984027 100644 --- a/website/source/docs/agent/cloud-auto-join.html.md +++ b/website/source/docs/agent/cloud-auto-join.html.md @@ -102,6 +102,13 @@ $ consul agent -retry-join "provider=azure tag_name=... tag_value=... tenant_id= - `client_id` (required) - the client to authenticate with. - `secret_access_key` (required) - the secret client key. **NOTE** This value often may have an equals sign in it's value, especially if generated from the Azure Portal, so is important to wrap in single quotes eg. `secret_acccess_key='fpOfcHQJAQBczjAxiVpeyLmX1M0M0KPBST+GU2GvEN4='` +Variables can also be provided by environmental variables: + +* `ARM_SUBSCRIPTION_ID` for subscription +* `ARM_TENANT_ID` for tenant +* `ARM_CLIENT_ID` for client +* `ARM_CLIENT_SECRET` for secret access key + Use these configuration parameters when using tags: - `tag_name` - the name of the tag to auto-join on.