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

Implement `skip_install` configuration to skip Chef installation.

This commit is contained in:
James Van Dyke 2013-07-06 00:15:21 -04:00
parent 4e1d0f5a12
commit 6e1e92f14f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
provisioner/chef-solo/provisioner.go
View File

@ -37,9 +37,10 @@ type config struct {
// Chef run.
Json map[string]interface{}
// Option to avoid sudo use when executing commands. Defaults to false.
AvoidSudo bool `mapstructure:"avoid_sudo"`
// If true
// If true, skips installing Chef. Defaults to false.
SkipInstall bool `mapstructure:"skip_install"`
}
@ -100,12 +101,14 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
cookbooksPaths := make([]string, len(p.config.CookbooksPaths))
copy(cookbooksPaths, p.config.CookbooksPaths)
var err error
Ui = ui
// Generic setup for Chef runs
err := InstallChefSolo(p.config.AvoidSudo, comm)
if err != nil {
return fmt.Errorf("Error installing Chef Solo: %s", err)
if !p.config.SkipInstall {
err = InstallChefSolo(p.config.AvoidSudo, comm)
if err != nil {
return fmt.Errorf("Error installing Chef Solo: %s", err)
}
}
err = CreateRemoteDirectory(RemoteCookbookPath, comm)
@ -145,7 +148,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
return fmt.Errorf("Error running Chef Solo: %s", err)
}
// return fmt.Errorf("Die")
return fmt.Errorf("Die")
return nil
}