From 97be19b17672df6502828da487f6be20a9d7582b Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Tue, 15 Jan 2019 13:15:28 -0800 Subject: [PATCH] rkt: revert to pre-0.9 --cpu flag See https://github.com/hashicorp/nomad/issues/3394#issuecomment-453296121 for details. During 0.9 development we switched to shares, but we'd prefer to maintain backward compat. --- drivers/rkt/driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rkt/driver.go b/drivers/rkt/driver.go index 067e78ef6..2f9bb1040 100644 --- a/drivers/rkt/driver.go +++ b/drivers/rkt/driver.go @@ -542,7 +542,7 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive prepareArgs = append(prepareArgs, fmt.Sprintf("--memory=%v", cfg.Resources.LinuxResources.MemoryLimitBytes)) // Add CPU isolator - prepareArgs = append(prepareArgs, fmt.Sprintf("--cpu-shares=%v", cfg.Resources.LinuxResources.CPUShares)) + prepareArgs = append(prepareArgs, fmt.Sprintf("--cpu=%v", cfg.Resources.LinuxResources.CPUShares)) // Add DNS servers if len(driverConfig.DNSServers) == 1 && (driverConfig.DNSServers[0] == "host" || driverConfig.DNSServers[0] == "none") {