matthew/packer-plugin-xenserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add options to configure vCPU numbers for XVA builders also.

Browse Source 
Signed-off-by: zheng chai <zheng.chai@citrix.com>
This commit is contained in:
zheng chai 2020-03-24 23:21:35 +08:00
parent 5e1f8571d6
commit c7ac4898ed
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builder/xenserver/xva/builder.go
View File

@ -21,6 +21,8 @@ type config struct {
xscommon.CommonConfig `mapstructure:",squash"` xscommon.CommonConfig `mapstructure:",squash"`
SourcePath string `mapstructure:"source_path"` SourcePath string `mapstructure:"source_path"`
VCPUsMax uint `mapstructure:"vcpus_max"`
VCPUsAtStartup uint `mapstructure:"vcpus_atstartup"`
VMMemory uint `mapstructure:"vm_memory"` VMMemory uint `mapstructure:"vm_memory"`
PlatformArgs map[string]string `mapstructure:"platform_args"` PlatformArgs map[string]string `mapstructure:"platform_args"`
@ -54,6 +56,17 @@ func (self *Builder) Prepare(raws ...interface{}) (params []string, retErr error
errs, self.config.CommonConfig.Prepare(&self.config.ctx, &self.config.PackerConfig)...) errs, self.config.CommonConfig.Prepare(&self.config.ctx, &self.config.PackerConfig)...)
// Set default values // Set default values
if self.config.VCPUsMax == 0 {
self.config.VCPUsMax = 1
}
if self.config.VCPUsAtStartup == 0 {
self.config.VCPUsAtStartup = 1
}
if self.config.VCPUsAtStartup > self.config.VCPUsMax {
self.config.VCPUsAtStartup = self.config.VCPUsMax
}
if self.config.VMMemory == 0 { if self.config.VMMemory == 0 {
self.config.VMMemory = 1024 self.config.VMMemory = 1024

12
builder/xenserver/xva/step_import_instance.go
View File

@ -60,6 +60,18 @@ func (self *stepImportInstance) Run(state multistep.StateBag) multistep.StepActi
} }
state.Put("instance_uuid", instanceId) state.Put("instance_uuid", instanceId)
err = instance.SetVCPUsMax(config.VCPUsMax)
if err != nil {
ui.Error(fmt.Sprintf("Error setting VM VCPUs Max=%d: %s", config.VCPUsMax, err.Error()))
return multistep.ActionHalt
}
err = instance.SetVCPUsAtStartup(config.VCPUsAtStartup)
if err != nil {
ui.Error(fmt.Sprintf("Error setting VM VCPUs At Startup=%d: %s", config.VCPUsAtStartup, err.Error()))
return multistep.ActionHalt
}
instance.SetDescription(config.VMDescription) instance.SetDescription(config.VMDescription)
if err != nil { if err != nil {
ui.Error(fmt.Sprintf("Error setting VM description: %s", err.Error())) ui.Error(fmt.Sprintf("Error setting VM description: %s", err.Error()))