iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

post-processor/vagrant: process templates in Configure

This commit is contained in:
Emil Hessman 2014-11-25 07:04:17 +01:00
parent 1de1350ee2
commit 3a8e02110e
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
post-processor/vagrant/post-processor.go
View File

@ -113,14 +113,8 @@ func (p *PostProcessor) PostProcessProvider(name string, provider Provider, ui p
// Write our Vagrantfile // Write our Vagrantfile
var customVagrantfile string var customVagrantfile string
if config.VagrantfileTemplate != "" { if config.VagrantfileTemplate != "" {
vagrantfilePath, err := config.tpl.Process(config.VagrantfileTemplate, nil) ui.Message(fmt.Sprintf("Using custom Vagrantfile: %s", config.VagrantfileTemplate))
if err != nil { customBytes, err := ioutil.ReadFile(config.VagrantfileTemplate)
return nil, false, err
}
ui.Message(fmt.Sprintf(
"Using custom Vagrantfile: %s", vagrantfilePath))
customBytes, err := ioutil.ReadFile(vagrantfilePath)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }
@ -200,6 +194,17 @@ func (p *PostProcessor) configureSingle(config *Config, raws ...interface{}) err
// Accumulate any errors // Accumulate any errors
errs := common.CheckUnusedConfig(md) errs := common.CheckUnusedConfig(md)
templates := map[string]*string{
"vagrantfile_template": &config.VagrantfileTemplate,
}
for key, ptr := range templates {
*ptr, err = config.tpl.Process(*ptr, nil)
if err != nil {
errs = packer.MultiErrorAppend(errs, fmt.Errorf("Error processing %s: %s", key, err))
}
}
validates := map[string]*string{ validates := map[string]*string{
"output": &config.OutputPath, "output": &config.OutputPath,
"vagrantfile_template": &config.VagrantfileTemplate, "vagrantfile_template": &config.VagrantfileTemplate,