-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support blacklisting fingerprinters #1949
Merged
dadgar
merged 3 commits into
hashicorp:master
from
carlpett:blacklist-fingerprints-and-drivers
Nov 9, 2016
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -133,6 +133,19 @@ see the [drivers documentation](/docs/drivers/index.html). | |
} | ||
``` | ||
|
||
- `"driver.blacklist"` `(string: "")` - Specifies a comma-separated list of | ||
blacklisted drivers . If specified, drivers in the blacklist will be | ||
disabled. If the blacklist is empty, all drivers are fingerprinted and enabled | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would remove the last sentences in both of these since it is pretty clear what the behavior will be and the fingerprinters/drivers still need to take into account the whitelist |
||
where applicable. | ||
|
||
```hcl | ||
client { | ||
options = { | ||
"driver.blacklist" = "docker,qemu" | ||
} | ||
} | ||
``` | ||
|
||
- `"env.blacklist"` `(string: see below)` - Specifies a comma-separated list of | ||
environment variable keys not to pass to these tasks. Nomad passes the host | ||
environment variables to `exec`, `raw_exec` and `java` tasks. If specified, | ||
|
@@ -213,6 +226,18 @@ see the [drivers documentation](/docs/drivers/index.html). | |
} | ||
``` | ||
|
||
- `"fingerprint.blacklist"` `(string: "")` - Specifies a comma-separated list of | ||
blacklisted fingerprinters. If specified, any fingerprinters in the blacklist | ||
will be disabled. If the blacklist is empty, all fingerprinters are used. | ||
|
||
```hcl | ||
client { | ||
options = { | ||
"fingerprint.blacklist" = "network" | ||
} | ||
} | ||
``` | ||
|
||
### `reserved` Parameters | ||
|
||
- `cpu` `(int: 0)` - Specifies the amount of CPU to reserve, in MHz. | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
White list needs this since you need to know both if the whitelist is active and if the fingerprinter is whitelisted (if not active nothing will be whitelisted). For blacklist you just need to know if it is contained in the map. so remove this variable and change :737 to
if _, ok := blacklist[name]; ok {
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same below and update the comments on those lines