Skip to content

Commit

Permalink
provisioner/chef-client: clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitchellh
mitchellh committed Feb 24, 2014
1 parent 0036503 commit 00eb912
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 205 deletions.
116 changes: 29 additions & 87 deletions provisioner/chef-client/provisioner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,32 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"strings"

"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer"
)

type Config struct {
common.PackerConfig `mapstructure:",squash"`

ConfigTemplate string `mapstructure:"config_template"`
NodeName string `mapstructure:"node_name"`
ServerUrl string `mapstructure:"chef_server_url"`
ExecuteCommand string `mapstructure:"execute_command"`
InstallCommand string `mapstructure:"install_command"`
ValidationCommand string `mapstructure:"validation_command"`
ClientCommand string `mapstructure:"client_command"`
Json map[string]interface{}
PreventSudo bool `mapstructure:"prevent_sudo"`
NodeName string `mapstructure:"node_name"`
RunList []string `mapstructure:"run_list"`
PreventSudo bool `mapstructure:"prevent_sudo"`
ServerUrl string `mapstructure:"chef_server_url"`
SkipCleanClient bool `mapstructure:"skip_clean_client"`
SkipCleanNode bool `mapstructure:"skip_clean_node"`
SkipInstall bool `mapstructure:"skip_install"`
StagingDir string `mapstructure:"staging_directory"`
ValidationCommand string `mapstructure:"validation_command"`

tpl *packer.ConfigTemplate
}
Expand All @@ -42,11 +44,6 @@ type Provisioner struct {
type ConfigTemplate struct {
NodeName string
ServerUrl string

// Templates don't support boolean statements until Go 1.2. In the
// mean time, we do this.
// TODO(mitchellh): Remove when Go 1.2 is released
HasNodeName bool
}

type ExecuteTemplate struct {
Expand All @@ -72,19 +69,19 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
p.config.tpl.UserVars = p.config.PackerUserVars

if p.config.ExecuteCommand == "" {
p.config.ExecuteCommand = "{{if .Sudo}}sudo {{end}}chef-client --no-color -c {{.ConfigPath}} -j {{.JsonPath}}"
p.config.ExecuteCommand = "{{if .Sudo}}sudo {{end}}chef-client " +
"--no-color -c {{.ConfigPath}} -j {{.JsonPath}}"
}

if p.config.InstallCommand == "" {
p.config.InstallCommand = "curl -L https://www.opscode.com/chef/install.sh | {{if .Sudo}}sudo {{end}}bash -s -- -v 10.26.0"
p.config.InstallCommand = "curl -L " +
"https://www.opscode.com/chef/install.sh | " +
"{{if .Sudo}}sudo {{end}}bash"
}

if p.config.ValidationCommand == "" {
p.config.ValidationCommand = "{{if .Sudo}}sudo {{end}} mv /tmp/validation.pem /etc/chef/validation.pem"
}

if p.config.ClientCommand == "" {
// p.config.ClientCommand = "{{if .Sudo}}sudo {{end}} mv /tmp/client.rb /etc/chef/client.rb"
p.config.ValidationCommand = "{{if .Sudo}}sudo {{end}} mv " +
"/tmp/validation.pem /etc/chef/validation.pem"
}

if p.config.RunList == nil {
Expand Down Expand Up @@ -133,7 +130,6 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
"execute_command": &p.config.ExecuteCommand,
"install_command": &p.config.InstallCommand,
"validation_command": &p.config.ValidationCommand,
"client_command": &p.config.ClientCommand,
}

for n, ptr := range validates {
Expand Down Expand Up @@ -175,31 +171,17 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
return fmt.Errorf("Error installing Chef: %s", err)
}
}
if err := p.moveClient(ui, comm); err != nil {
return fmt.Errorf("Error moving client.rb: %s", err)
}

if err := p.createDir(ui, comm, p.config.StagingDir); err != nil {
return fmt.Errorf("Error creating staging directory: %s", err)
}

if err := p.createHints(ui, comm); err != nil {
return fmt.Errorf("Error creating ohai hints file and directory: %s", err)
}

if err := p.moveValidation(ui, comm); err != nil {
return fmt.Errorf("Error moving validation.pem: %s", err)
}

nodeName := ""
if p.config.NodeName != "" {
nodeName = fmt.Sprintf("%s", p.config.NodeName)
}

serverUrl := ""
if p.config.ServerUrl != "" {
serverUrl = fmt.Sprintf("%s", p.config.ServerUrl)
}
nodeName := p.config.NodeName
serverUrl := p.config.ServerUrl

configPath, err := p.createConfig(ui, comm, nodeName, serverUrl)
if err != nil {
Expand All @@ -211,24 +193,21 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
return fmt.Errorf("Error creating JSON attributes: %s", err)
}

if err := p.executeChef(ui, comm, configPath, jsonPath); err != nil {
if err2 := p.cleanNode(ui, comm, p.config.NodeName); err2 != nil {
err = p.executeChef(ui, comm, configPath, jsonPath)
if !p.config.SkipCleanNode {
if err2 := p.cleanNode(ui, comm, nodeName); err2 != nil {
return fmt.Errorf("Error cleaning up chef node: %s", err2)
}
}

if err2 := p.cleanClient(ui, comm, p.config.NodeName); err2 != nil {
if !p.config.SkipCleanClient {
if err2 := p.cleanClient(ui, comm, serverUrl); err2 != nil {
return fmt.Errorf("Error cleaning up chef client: %s", err2)
}

return fmt.Errorf("Error executing Chef: %s", err)
}

if err := p.cleanNode(ui, comm, p.config.NodeName); err != nil {
return fmt.Errorf("Error cleaning up chef node: %s", err)
}

if err := p.cleanClient(ui, comm, p.config.NodeName); err != nil {
return fmt.Errorf("Error cleaning up chef client: %s", err)
if err != nil {
return fmt.Errorf("Error executing Chef: %s", err)
}

if err := p.removeDir(ui, comm, p.config.StagingDir); err != nil {
Expand Down Expand Up @@ -279,9 +258,8 @@ func (p *Provisioner) createConfig(ui packer.Ui, comm packer.Communicator, nodeN
}

configString, err := p.config.tpl.Process(tpl, &ConfigTemplate{
NodeName: nodeName,
ServerUrl: serverUrl,
HasNodeName: nodeName != "",
NodeName: nodeName,
ServerUrl: serverUrl,
})
if err != nil {
return "", err
Expand Down Expand Up @@ -341,19 +319,6 @@ func (p *Provisioner) createDir(ui packer.Ui, comm packer.Communicator, dir stri
return nil
}

func (p *Provisioner) createHints(ui packer.Ui, comm packer.Communicator) error {
ui.Message(fmt.Sprintf("Creating directory: /etc/chef/ohai/hints"))
cmd := &packer.RemoteCmd{
Command: fmt.Sprintf("mkdir -p /etc/chef/ohai/hints; echo '{}' > /etc/chef/ohai/hints/ec2.json"),
}

if err := cmd.StartWithUi(comm, ui); err != nil {
return err
}

return nil
}

func (p *Provisioner) cleanNode(ui packer.Ui, comm packer.Communicator, node string) error {
ui.Say("Cleaning up chef node...")
app := "knife node delete -y " + node
Expand Down Expand Up @@ -472,29 +437,6 @@ func (p *Provisioner) moveValidation(ui packer.Ui, comm packer.Communicator) err
return nil
}

func (p *Provisioner) moveClient(ui packer.Ui, comm packer.Communicator) error {
ui.Message("Moving client.rb...")

command, err := p.config.tpl.Process(p.config.ClientCommand, &InstallChefTemplate{
Sudo: !p.config.PreventSudo,
})
if err != nil {
return err
}

cmd := &packer.RemoteCmd{Command: command}
if err := cmd.StartWithUi(comm, ui); err != nil {
return err
}

if cmd.ExitStatus != 0 {
return fmt.Errorf(
"Move script exited with non-zero exit status %d", cmd.ExitStatus)
}

return nil
}

func (p *Provisioner) processJsonUserVars() (map[string]interface{}, error) {
jsonBytes, err := json.Marshal(p.config.Json)
if err != nil {
Expand Down Expand Up @@ -540,7 +482,7 @@ log_level :info
log_location STDOUT
chef_server_url "{{.ServerUrl}}"
validation_client_name "chef-validator"
{{if .HasNodeName}}
{{if ne .NodeName ""}}
node_name "{{.NodeName}}"
{{end}}
`
153 changes: 35 additions & 118 deletions provisioner/chef-client/provisioner_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package chefclient

import (
"github.com/mitchellh/packer/packer"
"io/ioutil"
"os"
"testing"

"github.com/mitchellh/packer/packer"
)

func testConfig() map[string]interface{} {
Expand Down Expand Up @@ -62,122 +63,38 @@ func TestProvisionerPrepare_configTemplate(t *testing.T) {
}
}

func TestProvisionerPrepare_cookbookPaths(t *testing.T) {
var p Provisioner

path1, err := ioutil.TempDir("", "cookbooks_one")
if err != nil {
t.Fatalf("err: %s", err)
}

path2, err := ioutil.TempDir("", "cookbooks_two")
if err != nil {
t.Fatalf("err: %s", err)
}

rolesPath, err := ioutil.TempDir("", "roles")
if err != nil {
t.Fatalf("err: %s", err)
}

dataBagsPath, err := ioutil.TempDir("", "data_bags")
if err != nil {
t.Fatalf("err: %s", err)
}

defer os.Remove(path1)
defer os.Remove(path2)
defer os.Remove(rolesPath)
defer os.Remove(dataBagsPath)

config := testConfig()
config["cookbook_paths"] = []string{path1, path2}
config["roles_path"] = rolesPath
config["data_bags_path"] = dataBagsPath

err = p.Prepare(config)
if err != nil {
t.Fatalf("err: %s", err)
}

if len(p.config.CookbookPaths) != 2 {
t.Fatalf("unexpected: %#v", p.config.CookbookPaths)
}

if p.config.CookbookPaths[0] != path1 || p.config.CookbookPaths[1] != path2 {
t.Fatalf("unexpected: %#v", p.config.CookbookPaths)
}

if p.config.RolesPath != rolesPath {
t.Fatalf("unexpected: %#v", p.config.RolesPath)
}

if p.config.DataBagsPath != dataBagsPath {
t.Fatalf("unexpected: %#v", p.config.DataBagsPath)
}
}

func TestProvisionerPrepare_dataBagsPath(t *testing.T) {
var p Provisioner

dataBagsPath, err := ioutil.TempDir("", "data_bags")
if err != nil {
t.Fatalf("err: %s", err)
}
defer os.Remove(dataBagsPath)

config := testConfig()
config["data_bags_path"] = dataBagsPath

err = p.Prepare(config)
if err != nil {
t.Fatalf("err: %s", err)
}

if p.config.DataBagsPath != dataBagsPath {
t.Fatalf("unexpected: %#v", p.config.DataBagsPath)
}
}

func TestProvisionerPrepare_rolesPath(t *testing.T) {
var p Provisioner

rolesPath, err := ioutil.TempDir("", "roles")
if err != nil {
t.Fatalf("err: %s", err)
}
defer os.Remove(rolesPath)

config := testConfig()
config["roles_path"] = rolesPath

err = p.Prepare(config)
if err != nil {
t.Fatalf("err: %s", err)
}

if p.config.RolesPath != rolesPath {
t.Fatalf("unexpected: %#v", p.config.RolesPath)
}
}

func TestProvisionerPrepare_json(t *testing.T) {
config := testConfig()
config["json"] = map[string]interface{}{
"foo": "{{ user `foo` }}",
}

config[packer.UserVariablesConfigKey] = map[string]string{
"foo": `"bar\baz"`,
}

var p Provisioner
err := p.Prepare(config)
if err != nil {
t.Fatalf("err: %s", err)
}

if p.config.Json["foo"] != `"bar\baz"` {
t.Fatalf("bad: %#v", p.config.Json)
func TestProvisionerPrepare_commands(t *testing.T) {
commands := []string{
"execute_command",
"install_command",
"validation_command",
}

for _, command := range commands {
var p Provisioner

// Test not set
config := testConfig()
delete(config, command)
err := p.Prepare(config)
if err != nil {
t.Fatalf("err: %s", err)
}

// Test invalid template
config = testConfig()
config[command] = "{{if NOPE}}"
err = p.Prepare(config)
if err == nil {
t.Fatal("should error")
}

// Test good template
config = testConfig()
config[command] = "{{.Foo}}"
err = p.Prepare(config)
if err != nil {
t.Fatalf("err: %s", err)
}
}
}

0 comments on commit 00eb912

Please sign in to comment.