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

Address comments from PR

This commit is contained in:
Calle Pettersson 2016-11-09 11:50:16 +01:00
parent 8632696e2d
commit 4304755c12
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/client.go
View File

@ -721,7 +721,6 @@ func (c *Client) fingerprint() error {
whitelist := c.config.ReadStringListToMap("fingerprint.whitelist")
whitelistEnabled := len(whitelist) > 0
blacklist := c.config.ReadStringListToMap("fingerprint.blacklist")
blacklistEnabled := len(blacklist) > 0
c.logger.Printf("[DEBUG] client: built-in fingerprints: %v", fingerprint.BuiltinFingerprints())
@ -733,8 +732,8 @@ func (c *Client) fingerprint() error {
skipped = append(skipped, name)
continue
}
// Skip modules that are in the blacklist if it is enabled.
if _, ok := blacklist[name]; blacklistEnabled && ok {
// Skip modules that are in the blacklist
if _, ok := blacklist[name]; ok {
skipped = append(skipped, name)
continue
}
@ -790,7 +789,6 @@ func (c *Client) setupDrivers() error {
whitelist := c.config.ReadStringListToMap("driver.whitelist")
whitelistEnabled := len(whitelist) > 0
blacklist := c.config.ReadStringListToMap("driver.blacklist")
blacklistEnabled := len(blacklist) > 0
var avail []string
var skipped []string
@ -802,8 +800,8 @@ func (c *Client) setupDrivers() error {
skipped = append(skipped, name)
continue
}
// Skip fingerprinting drivers that are in the blacklist if it is enabled.
if _, ok := blacklist[name]; blacklistEnabled && ok {
// Skip fingerprinting drivers that are in the blacklist
if _, ok := blacklist[name]; ok {
skipped = append(skipped, name)
continue
}

5
website/source/docs/agent/configuration/client.html.md
View File

@ -135,8 +135,7 @@ 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
where applicable.
disabled.
```hcl
client {
@ -228,7 +227,7 @@ 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.
will be disabled.
```hcl
client {