Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
7687ac0e
Commit
7687ac0e
authored
5 years ago
by
Seth Hoenig
Browse files
Options
Download
Email Patches
Plain Diff
docs: vault integration docs should reference new token_explicit_max_ttl field
parent
4f1890b5
Branches unavailable
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.4.0-rc.1
v1.4.0-beta.1
v1.3.8
v1.3.7
v1.3.6
v1.3.5
v1.3.4
v1.3.3
v1.3.2
v1.3.1
v1.3.0
v1.3.0-rc.1
v1.3.0-beta.1
v1.2.15
v1.2.14
v1.2.13
v1.2.12
v1.2.11
v1.2.10
v1.2.9
v1.2.8
v1.2.7
v1.2.6
v1.2.5
v1.2.4
v1.2.3
v1.2.2
v1.2.1
v1.2.0
v1.2.0-rc1
v1.2.0-beta1
v1.1.18
v1.1.17
v1.1.16
v1.1.15
v1.1.14
v1.1.13
v1.1.12
v1.1.11
v1.1.10
v1.1.9
v1.1.8
v1.1.7
v1.1.6
v1.1.5
v1.1.4
v1.1.3
v1.1.2
v1.1.1
v1.1.0
v1.1.0-rc1
v1.1.0-beta1
v1.0.18
v1.0.17
v1.0.16
v1.0.15
v1.0.14
v1.0.13
v1.0.12
v1.0.11
v1.0.10
v1.0.9
v1.0.8
v1.0.7
v1.0.6
v1.0.5
v1.0.4
v1.0.3
v1.0.2
v1.0.1
v1.0.0
v1.0.0-rc1
v1.0.0-beta3
v1.0.0-beta2
v0.12.12
v0.12.11
v0.12.10
v0.12.9
v0.12.8
v0.12.7
v0.12.6
v0.12.5
v0.12.4
v0.12.4-rc1
v0.12.3
v0.12.2
v0.12.1
v0.12.0
v0.12.0-rc1
v0.12.0-beta2
v0.12.0-beta1
v0.11.8
v0.11.7
v0.11.6
v0.11.5
v0.11.4
v0.11.3
v0.11.2
v0.11.1
v0.11.0
v0.11.0-rc1
v0.11.0-beta2
v0.11.0-beta1
v0.10.9
v0.10.8
v0.10.7
v0.10.6
v0.10.5
v0.10.4
v0.10.4-rc1
nightly
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
dev/vault/nomad-cluster-role.json
+1
-1
dev/vault/nomad-cluster-role.json
e2e/vault/consts_test.go
+2
-2
e2e/vault/consts_test.go
website/source/data/vault/nomad-cluster-role.json
+1
-1
website/source/data/vault/nomad-cluster-role.json
website/source/docs/vault-integration/index.html.md
+2
-2
website/source/docs/vault-integration/index.html.md
website/source/guides/integrations/vault-integration/index.html.md
+2
-2
...ource/guides/integrations/vault-integration/index.html.md
with
8 additions
and
8 deletions
+8
-8
dev/vault/nomad-cluster-role.json
+
1
-
1
View file @
7687ac0e
{
"disallowed_policies"
:
"nomad-server"
,
"explicit_max_ttl"
:
0
,
"
token_
explicit_max_ttl"
:
0
,
"name"
:
"nomad-cluster"
,
"orphan"
:
false
,
"token_period"
:
259200
,
...
...
This diff is collapsed.
Click to expand it.
e2e/vault/consts_test.go
+
2
-
2
View file @
7687ac0e
...
...
@@ -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
,
}
...
...
This diff is collapsed.
Click to expand it.
website/source/data/vault/nomad-cluster-role.json
+
1
-
1
View file @
7687ac0e
{
"disallowed_policies"
:
"nomad-server"
,
"explicit_max_ttl"
:
0
,
"
token_
explicit_max_ttl"
:
0
,
"name"
:
"nomad-cluster"
,
"orphan"
:
true
,
"token_period"
:
259200
,
...
...
This diff is collapsed.
Click to expand it.
website/source/docs/vault-integration/index.html.md
+
2
-
2
View file @
7687ac0e
...
...
@@ -138,7 +138,7 @@ 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
,
"token_period"
:
259200
,
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
website/source/guides/integrations/vault-integration/index.html.md
+
2
-
2
View file @
7687ac0e
...
...
@@ -189,7 +189,7 @@ 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
,
"token_period"
:
259200
,
...
...
@@ -210,7 +210,7 @@ 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
,
"token_period"
:
259200
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help