luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #6533 from hashicorp/docs-fixup-connect

Browse source 
docs: fix links to connect
This commit is contained in:
Michael Schurter 2019-10-23 08:28:42 -07:00 committed by GitHub
parent 9d76515aa0 0fd36d1e13
commit 42e21ade39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
website/source/docs/job-specification/connect.html.md
View file

@ -38,11 +38,12 @@ level.
sidecar_service {} sidecar_service {}
} }
} }
task "web" { task "web" {
driver = "docker" driver = "docker"
config { config {
image = "test/test:v1" image = "test/test:v1"
} }
} }
} }
} }

8
website/source/docs/job-specification/service.html.md
View file

@ -73,7 +73,8 @@ for service discovery. For more details on using Nomad with Consul please see
the [Consul integration documentation][service-discovery]. the [Consul integration documentation][service-discovery].
Nomad 0.10 also allows specifying the `service` stanza at the task group level. Nomad 0.10 also allows specifying the `service` stanza at the task group level.
This enables services in the same task group to opt into [Consul Connect][] integration. This enables services in the same task group to opt into [Consul
Connect][connect] integration.
## `service` Parameters ## `service` Parameters
@ -82,6 +83,9 @@ This enables services in the same task group to opt into [Consul Connect][] inte
define multiple checks for the service. At this time, Nomad supports the define multiple checks for the service. At this time, Nomad supports the
`grpc`, `http`, `script`<sup><small>1</small></sup>, and `tcp` checks. `grpc`, `http`, `script`<sup><small>1</small></sup>, and `tcp` checks.
- `connect` - Configures the [Consul Connect][connect] integration. Only
available on group services.
- `name` `(string: "<job>-<group>-<task>")` - Specifies the name this service - `name` `(string: "<job>-<group>-<task>")` - Specifies the name this service
will be advertised as in Consul. If not supplied, this will default to the will be advertised as in Consul. If not supplied, this will default to the
name of the job, group, and task concatenated together with a dash, like name of the job, group, and task concatenated together with a dash, like
@ -636,4 +640,4 @@ system of a task for that driver.</small>
[network]: /docs/job-specification/network.html "Nomad network Job Specification" [network]: /docs/job-specification/network.html "Nomad network Job Specification"
[qemu]: /docs/drivers/qemu.html "Nomad qemu Driver" [qemu]: /docs/drivers/qemu.html "Nomad qemu Driver"
[restart_stanza]: /docs/job-specification/restart.html "restart stanza" [restart_stanza]: /docs/job-specification/restart.html "restart stanza"
[Connect]: /docs/job-specification/connect.html "Nomad Consul Connect Integration" [connect]: /docs/job-specification/connect.html "Nomad Consul Connect Integration"