From 5ebf95eb739d3c48e96f7f80e0a4ed8cfceca797 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Wed, 2 Nov 2016 18:29:17 -0400 Subject: [PATCH] Address feedback --- website/source/docs/job-specification/group.html.md | 5 +++-- website/source/docs/job-specification/job.html.md | 4 ++-- website/source/docs/job-specification/task.html.md | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/website/source/docs/job-specification/group.html.md b/website/source/docs/job-specification/group.html.md index d65738aa0..5995b9d83 100644 --- a/website/source/docs/job-specification/group.html.md +++ b/website/source/docs/job-specification/group.html.md @@ -53,8 +53,9 @@ job "docs" { within this group. This can be specified multiple times, to add a task as part of the group. -- `vault` ([Vault][]: nil) - Specifies the configuration options - for connecting the tasks in this group to Vault. +- `vault` ([Vault][]: nil) - Specifies the set of Vault policies + required by all tasks in this group. Overrides a `vault` block set at the + `job` level. ## `group` Examples diff --git a/website/source/docs/job-specification/job.html.md b/website/source/docs/job-specification/job.html.md index bd322142e..7041dea6f 100644 --- a/website/source/docs/job-specification/job.html.md +++ b/website/source/docs/job-specification/job.html.md @@ -87,8 +87,8 @@ job "docs" { - `update` ([Update][update]: nil) - Specifies the task's update strategy. When omitted, rolling updates are disabled. -- `vault` ([Vault][]: nil) - Specifies the configuration options - for connecting the tasks in this job to Vault. +- `vault` ([Vault][]: nil) - Specifies the set of Vault policies + required by all tasks in this job. - `vault_token` `(string: "")` - Specifies the Vault token that proves the submitter of the job has access to the specified policies in the diff --git a/website/source/docs/job-specification/task.html.md b/website/source/docs/job-specification/task.html.md index b6b2e573f..cb05d5ac4 100644 --- a/website/source/docs/job-specification/task.html.md +++ b/website/source/docs/job-specification/task.html.md @@ -66,8 +66,9 @@ job "docs" { defaults to the same user as the Nomad client. This can only be set on Linux platforms. -- `vault` ([Vault][]: nil) - Specifies the configuration options - for connecting this task to Vault. +- `vault` ([Vault][]: nil) - Specifies the set of Vault policies + required by the task. This overrides any `vault` block set at the `group` or + `job` level. ## `task` Examples