From ba6832ffff276d6d833c2b2e498f273d6993bfa8 Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Wed, 22 Jul 2020 13:53:27 -0400 Subject: [PATCH 1/2] docs: snapshot uses consul --- website/pages/docs/commands/operator/snapshot-agent.mdx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/website/pages/docs/commands/operator/snapshot-agent.mdx b/website/pages/docs/commands/operator/snapshot-agent.mdx index 109939637..eb7310f10 100644 --- a/website/pages/docs/commands/operator/snapshot-agent.mdx +++ b/website/pages/docs/commands/operator/snapshot-agent.mdx @@ -17,7 +17,7 @@ The agent can be run as a long-running daemon process or in a one-shot mode from a batch job. As a long-running daemon, the agent will perform a leader election so multiple processes can be run in a highly available fashion with automatic failover. In daemon mode, the agent will also register itself with -Nomad as a service, along with health checks that show the agent is alive +Consul as a service, along with health checks that show the agent is alive and able to take snapshots. If ACLs are enabled, a management token must be supplied in order to perform @@ -27,7 +27,7 @@ The Config file has the following format (shown populated with default values): ```hcl nomad { - http_addr = "http://127.0.0.1:8500" + address = "http://127.0.0.1:8500" token = "" region = "" ca_file = "" @@ -147,3 +147,8 @@ Note that despite the AWS references, any S3-compatible endpoint can be specifie - `-azure-blob-account_key`: for connecting to Azure Blob storage. - `-azure-blob-container-name`: Container to use. Required for Azure blob storage, and setting this disables local storage. - `-azure-blob-environment`: Environment to use. Defaults to AZUREPUBLICCLOUD. Other valid environments are AZURECHINACLOUD, AZUREGERMANCLOUD and AZUREUSGOVERNMENTCLOUD. + + +### Google Storage Options + +- `-google-bucket`: The bucket to use. From 9310009dde729d96cd9c103c49e6b2cb75e3895e Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Wed, 22 Jul 2020 13:56:52 -0400 Subject: [PATCH 2/2] changelog node networks change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da9c4d84d..2bfef90ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ BUG FIXES: * core: Fixed an atomicity bug where a job may fail to start if leadership transition occured while processing the job [[GH-8435](https://github.com/hashicorp/nomad/issues/8435)] * core: Fixed a regression bug where jobs with group level networking stanza fail to be scheduled with "missing network" constraint error [[GH-8407](https://github.com/hashicorp/nomad/pull/8407)] * core (Enterprise): Fixed a bug where users were not given full 6 hours to apply initial license when upgrading from unlicensed versions of Nomad. [[GH-8457](https://github.com/hashicorp/nomad/issues/8457)] + * client: Fixed a bug where `network_interface` client configuration was ignored [[GH-8486](https://github.com/hashicorp/nomad/issues/8486)] * jobspec: Fixed validation of multi-region datacenters to allow empty region `datacenters` to default to job-level `datacenters` [[GH-8426](https://github.com/hashicorp/nomad/issues/8426)] * scheduler: Fixed a bug in Nomad Enterprise where canaries were not being created during multi-region deployments [[GH-8456](https://github.com/hashicorp/nomad/pull/8456)] * ui: Fixed stale namespaces after changing acl tokens [[GH-8413](https://github.com/hashicorp/nomad/issues/8413)]