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

Merge pull request #6752 from hashicorp/docs-vault-token_period 

docs: vault integration docs should reference new token_period field
This commit is contained in:
Seth Hoenig 2019-12-02 16:21:17 -05:00 committed by GitHub
parent 295713b1d7 953e40c8ed
commit d81a091ccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/vault/nomad-cluster-role.json
View File

@ -1,8 +1,8 @@
{
"disallowed_policies": "nomad-server",
"explicit_max_ttl": 0,
"token_explicit_max_ttl": 0,
"name": "nomad-cluster",
"orphan": false,
"period": 259200,
"token_period": 259200,
"renewable": true
}

4
e2e/vault/consts_test.go
View File

@ -35,10 +35,10 @@ var (
// role is the recommended nomad cluster role
role = map[string]interface{}{
"disallowed_policies": "nomad-server",
"explicit_max_ttl": 0,
"explicit_max_ttl": 0, // use old name for vault compatibility
"name": "nomad-cluster",
"orphan": false,
"period": 259200,
"period": 259200, // use old name for vault compatibility
"renewable": true,
}

4
website/source/data/vault/nomad-cluster-role.json
View File

@ -1,8 +1,8 @@
{
"disallowed_policies": "nomad-server",
"explicit_max_ttl": 0,
"token_explicit_max_ttl": 0,
"name": "nomad-cluster",
"orphan": true,
"period": 259200,
"token_period": 259200,
"renewable": true
}

8
website/source/docs/vault-integration/index.html.md
View File

@ -138,10 +138,10 @@ An example token role definition is given below:
```json
{
"disallowed_policies": "nomad-server",
"explicit_max_ttl": 0,
"token_explicit_max_ttl": 0,
"name": "nomad-cluster",
"orphan": true,
"period": 259200,
"token_period": 259200,
"renewable": true
}
```
@ -171,7 +171,7 @@ documentation for all possible fields and more complete documentation.
Nomad. This was remedied in 0.6.5 and does not effect earlier versions
of Vault.
* `explicit_max_ttl` - Specifies the max TTL of a token. **Must be set to `0`** to
* `token_explicit_max_ttl` - Specifies the max TTL of a token. **Must be set to `0`** to
allow periodic tokens.
* `name` - Specifies the name of the policy. We recommend using the name
@ -196,7 +196,7 @@ documentation for all possible fields and more complete documentation.
making bootstrapping and upgrading simpler. As such, **setting `orphan = true`
is the recommended setting**.
* `period` - Specifies the length the TTL is extended by each renewal in
* `token_period` - Specifies the length the TTL is extended by each renewal in
seconds. It is suggested to set this value on the order of magnitude of 3 days
(259200 seconds) to avoid a large renewal request rate to Vault. **Must be set
to a positive value**.

8
website/source/guides/integrations/vault-integration/index.html.md
View File

@ -189,10 +189,10 @@ submitted to Nomad. We will use the following token role:
```json
{
"allowed_policies": "access-tables",
"explicit_max_ttl": 0,
"token_explicit_max_ttl": 0,
"name": "nomad-cluster",
"orphan": true,
"period": 259200,
"token_period": 259200,
"renewable": true
}
```
@ -210,10 +210,10 @@ disallowed policies group. An example of this is shown below:
```json
{
"disallowed_policies": "nomad-server",
"explicit_max_ttl": 0,
"token_explicit_max_ttl": 0,
"name": "nomad-cluster",
"orphan": true,
"period": 259200,
"token_period": 259200,
"renewable": true
}
```