From 1851b897373cc88d526670104b632292efca66df Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 31 Oct 2016 21:52:45 -0400 Subject: [PATCH] Address feedback --- command/init.go | 9 +++++++-- .../job-specification/ephemeral_disk.html.md | 18 +++++++++--------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/command/init.go b/command/init.go index 712946496..b77ec0c67 100644 --- a/command/init.go +++ b/command/init.go @@ -90,6 +90,11 @@ job "example" { # decision on placement. This configuration is optional and defaults to # "service". For a full list of job types and their differences, please see # the online documentation. + # + # For more information, please see the online documentation at: + # + # https://www.nomadproject.io/docs/jobspec/schedulers.html + # type = "service" # The "constraint" stanza defines additional constraints for placing this job, @@ -117,11 +122,11 @@ job "example" { # update { # The "stagger" parameter specifies to do rolling updates of this job every - # 10 seconds + # 10 seconds. stagger = "10s" # The "max_parallel" parameter specifies the maximum number of updates to - # perform in paralle. In this case, this specifies to update a single task + # perform in parallel. In this case, this specifies to update a single task # at a time. max_parallel = 1 } diff --git a/website/source/docs/job-specification/ephemeral_disk.html.md b/website/source/docs/job-specification/ephemeral_disk.html.md index 06dfe4b97..098b42185 100644 --- a/website/source/docs/job-specification/ephemeral_disk.html.md +++ b/website/source/docs/job-specification/ephemeral_disk.html.md @@ -3,9 +3,9 @@ layout: "docs" page_title: "ephemeral_disk Stanza - Job Specification" sidebar_current: "docs-job-specification-ephemeral_disk" description: |- - The "ephemeral_disk" stanza instructs Nomad to utilize an ephemeral disk - instead of a hard disk requirement, and can also enable sticky volumes and - live data migrations. + The "ephemeral_disk" stanza describes the ephemeral disk requirements of the + task group. Ephemeral disks can be marked as sticky and support live data + migrations. --- # `ephemeral_disk` Stanza @@ -19,10 +19,10 @@ description: |- -The `ephemeral_disk` stanza instructs Nomad to utilize an ephemeral disk instead -of a hard disk requirement. Clients using this stanza should not specify disk -requirements in the [resources stanza][resources] of the task. All tasks in this -group will share the same ephemeral disk. + +The `ephemeral_disk` stanza describes the ephemeral disk requirements of the +task group. Ephemeral disks can be marked as sticky and support live data +migrations. All tasks in this group will share the same ephemeral disk. ```hcl job "docs" { @@ -40,8 +40,8 @@ job "docs" { - `migrate` `(bool: false)` - Specifies that the Nomad client should make a best-effort attempt to migrate the data from a remote machine if placement - should fail. During data migration, the task will block starting until the - data migration has completed. + cannot be made on the original node. During data migration, the task will + block starting until the data migration has completed. - `size` `(int: 300)` - Specifies the size of the ephemeral disk in MB.