Merge pull request #2020 from ranjib/template_args_lxc

diptanu · web-flow · commit 3e6390839fe2 · 2016-11-22T05:45:17.000+01:00
(bug)Fix error message. Pass on template args
diff --git a/client/driver/lxc.go b/client/driver/lxc.go
@@ -182,7 +182,7 @@ func (d *LxcDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e
 	containerName := fmt.Sprintf("%s-%s", task.Name, ctx.AllocID)
 	c, err := lxc.NewContainer(containerName, lxcPath)
 	if err != nil {
-		return nil, fmt.Errorf("unable to create container: %v", err)
+		return nil, fmt.Errorf("unable to initialize container: %v", err)
 	}
 
 	var verbosity lxc.Verbosity
@@ -223,6 +223,7 @@ func (d *LxcDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e
 		Arch:                 driverConfig.Arch,
 		FlushCache:           driverConfig.FlushCache,
 		DisableGPGValidation: driverConfig.DisableGPGValidation,
+		ExtraArgs:            driverConfig.TemplateArgs,
 	}
 
 	if err := c.Create(options); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ func (d LxcDriver) Start(ctx ExecContext, task *structs.Task) (DriverHandle, e`
`182`	`182`	`containerName := fmt.Sprintf("%s-%s", task.Name, ctx.AllocID)`
`183`	`183`	`c, err := lxc.NewContainer(containerName, lxcPath)`
`184`	`184`	`if err != nil {`
`185`		`- return nil, fmt.Errorf("unable to create container: %v", err)`
	`185`	`+ return nil, fmt.Errorf("unable to initialize container: %v", err)`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`var verbosity lxc.Verbosity`
`@@ -223,6 +223,7 @@ func (d LxcDriver) Start(ctx ExecContext, task *structs.Task) (DriverHandle, e`
`223`	`223`	`Arch: driverConfig.Arch,`
`224`	`224`	`FlushCache: driverConfig.FlushCache,`
`225`	`225`	`DisableGPGValidation: driverConfig.DisableGPGValidation,`
	`226`	`+ ExtraArgs: driverConfig.TemplateArgs,`
`226`	`227`	`}`
`227`	`228`
`228`	`229`	`if err := c.Create(options); err != nil {`