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

provisioner/salt-masterless: convert to new template stuff + user vars

Browse Source
This commit is contained in:
Mitchell Hashimoto 2013-08-09 14:24:09 -07:00
parent 332bdf6edc
commit 55ad0058bc
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
provisioner/salt-masterless/provisioner.go
View File

@ -15,6 +15,8 @@ import (
const DefaultTempConfigDir = "/tmp/salt" const DefaultTempConfigDir = "/tmp/salt"
type Config struct { type Config struct {
common.PackerConfig `mapstructure:",squash"`
// If true, run the salt-bootstrap script // If true, run the salt-bootstrap script
SkipBootstrap bool `mapstructure:"skip_bootstrap"` SkipBootstrap bool `mapstructure:"skip_bootstrap"`
BootstrapArgs string `mapstructure:"bootstrap_args"` BootstrapArgs string `mapstructure:"bootstrap_args"`
@ -24,6 +26,8 @@ type Config struct {
// Where files will be copied before moving to the /srv/salt directory // Where files will be copied before moving to the /srv/salt directory
TempConfigDir string `mapstructure:"temp_config_dir"` TempConfigDir string `mapstructure:"temp_config_dir"`
tpl *common.Template
} }
type Provisioner struct { type Provisioner struct {
@ -36,6 +40,12 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
return err return err
} }
p.config.tpl, err = common.NewTemplate()
if err != nil {
return err
}
p.config.tpl.UserVars = p.config.PackerUserVars
if p.config.TempConfigDir == "" { if p.config.TempConfigDir == "" {
p.config.TempConfigDir = DefaultTempConfigDir p.config.TempConfigDir = DefaultTempConfigDir
} }
@ -43,6 +53,21 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
// Accumulate any errors // Accumulate any errors
errs := common.CheckUnusedConfig(md) errs := common.CheckUnusedConfig(md)
templates := map[string]*string{
"bootstrap_args": &p.config.BootstrapArgs,
"local_state_tree": &p.config.LocalStateTree,
"temp_config_dir": &p.config.TempConfigDir,
}
for n, ptr := range templates {
var err error
*ptr, err = p.config.tpl.Process(*ptr, nil)
if err != nil {
errs = packer.MultiErrorAppend(
errs, fmt.Errorf("Error processing %s: %s", n, err))
}
}
if p.config.LocalStateTree == "" { if p.config.LocalStateTree == "" {
errs = packer.MultiErrorAppend(errs, errs = packer.MultiErrorAppend(errs,
errors.New("Please specify a local_state_tree")) errors.New("Please specify a local_state_tree"))