From 67eb18d9aa43c2bacd07ec813a5f627492512de9 Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Thu, 10 Dec 2015 12:22:31 -0800 Subject: [PATCH 1/5] Use filepath.FromSlash so the test uses platform-specific path separators --- command/agent/config_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/command/agent/config_test.go b/command/agent/config_test.go index 917ecf1c0..e342b997b 100644 --- a/command/agent/config_test.go +++ b/command/agent/config_test.go @@ -318,9 +318,10 @@ func TestConfig_LoadConfigsFileOrder(t *testing.T) { } expected := []string{ - "test-resources/etcnomad/common.hcl", - "test-resources/etcnomad/server.json", - "test-resources/myconf", + // filepath.FromSlash changes these to backslash \ on Windows + filepath.FromSlash("test-resources/etcnomad/common.hcl"), + filepath.FromSlash("test-resources/etcnomad/server.json"), + filepath.FromSlash("test-resources/myconf"), } config := config1.Merge(config2) From 462a721edbf97bf72ac2cf434651a96d6d805f6c Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Thu, 10 Dec 2015 14:48:06 -0800 Subject: [PATCH 2/5] Enable raw exec in dev mode --- client/driver/raw_exec.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/driver/raw_exec.go b/client/driver/raw_exec.go index 5b1d98269..7bc2ac112 100644 --- a/client/driver/raw_exec.go +++ b/client/driver/raw_exec.go @@ -48,6 +48,11 @@ func (d *RawExecDriver) Fingerprint(cfg *config.Config, node *structs.Node) (boo return false, fmt.Errorf("Failed to parse %v option: %v", rawExecConfigOption, err) } + // Always turn this driver on in dev mode because we don't have a config file + if cfg.DevMode { + enabled = true + } + if enabled { d.logger.Printf("[WARN] driver.raw_exec: raw exec is enabled. Only enable if needed") node.Attributes["driver.raw_exec"] = "1" From 1821db757b8969e25091e87df7c7f63ef1fc2aa1 Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Thu, 10 Dec 2015 15:03:25 -0800 Subject: [PATCH 3/5] Use ReadBoolDefault --- client/driver/raw_exec.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/client/driver/raw_exec.go b/client/driver/raw_exec.go index 7bc2ac112..9dbec8fb3 100644 --- a/client/driver/raw_exec.go +++ b/client/driver/raw_exec.go @@ -3,7 +3,6 @@ package driver import ( "fmt" "path/filepath" - "strconv" "time" "github.com/hashicorp/nomad/client/allocdir" @@ -43,10 +42,7 @@ func NewRawExecDriver(ctx *DriverContext) Driver { func (d *RawExecDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool, error) { // Check that the user has explicitly enabled this executor. - enabled, err := strconv.ParseBool(cfg.ReadDefault(rawExecConfigOption, "false")) - if err != nil { - return false, fmt.Errorf("Failed to parse %v option: %v", rawExecConfigOption, err) - } + enabled := cfg.ReadBoolDefault(rawExecConfigOption, false) // Always turn this driver on in dev mode because we don't have a config file if cfg.DevMode { From d5fc7f602229cbb677cbdcf7fd8f5659691dd63a Mon Sep 17 00:00:00 2001 From: Charlie Drage Date: Thu, 10 Dec 2015 18:09:14 -0500 Subject: [PATCH 4/5] Fix minor spelling error --- client/consul.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/consul.go b/client/consul.go index 52cf68845..bb3c93b19 100644 --- a/client/consul.go +++ b/client/consul.go @@ -280,7 +280,7 @@ func (c *ConsulService) registerService(service *structs.Service, task *structs. for _, check := range service.Checks { cr := c.makeCheck(service, check, host, port) if err := c.registerCheck(cr); err != nil { - c.logger.Printf("[ERROR] consul: Error while registerting check %v with consul: %v", check.Name, err) + c.logger.Printf("[ERROR] consul: Error while registering check %v with consul: %v", check.Name, err) mErr.Errors = append(mErr.Errors, err) } From 5bf8a1fff6df60db79f10060a1699323e6a585b0 Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Thu, 10 Dec 2015 15:24:21 -0800 Subject: [PATCH 5/5] Move raw_exec enabled into the DevMode config block --- client/driver/raw_exec.go | 5 ----- command/agent/config.go | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/client/driver/raw_exec.go b/client/driver/raw_exec.go index 9dbec8fb3..9491873ba 100644 --- a/client/driver/raw_exec.go +++ b/client/driver/raw_exec.go @@ -44,11 +44,6 @@ func (d *RawExecDriver) Fingerprint(cfg *config.Config, node *structs.Node) (boo // Check that the user has explicitly enabled this executor. enabled := cfg.ReadBoolDefault(rawExecConfigOption, false) - // Always turn this driver on in dev mode because we don't have a config file - if cfg.DevMode { - enabled = true - } - if enabled { d.logger.Printf("[WARN] driver.raw_exec: raw exec is enabled. Only enable if needed") node.Attributes["driver.raw_exec"] = "1" diff --git a/command/agent/config.go b/command/agent/config.go index e94ce2e4c..e3fb3ae17 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -257,6 +257,9 @@ func DevConfig() *Config { } else if runtime.GOOS == "linux" { conf.Client.NetworkInterface = "lo" } + conf.Client.Options = map[string]string{ + "driver.raw_exec.enable": "true", + } return conf }