provisioner/chef-client: clean up
This commit is contained in:
parent
1502eed147
commit
d7e6409b9a
|
@ -7,30 +7,32 @@ import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/mitchellh/packer/common"
|
|
||||||
"github.com/mitchellh/packer/packer"
|
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/mitchellh/packer/common"
|
||||||
|
"github.com/mitchellh/packer/packer"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
common.PackerConfig `mapstructure:",squash"`
|
common.PackerConfig `mapstructure:",squash"`
|
||||||
|
|
||||||
ConfigTemplate string `mapstructure:"config_template"`
|
ConfigTemplate string `mapstructure:"config_template"`
|
||||||
NodeName string `mapstructure:"node_name"`
|
|
||||||
ServerUrl string `mapstructure:"chef_server_url"`
|
|
||||||
ExecuteCommand string `mapstructure:"execute_command"`
|
ExecuteCommand string `mapstructure:"execute_command"`
|
||||||
InstallCommand string `mapstructure:"install_command"`
|
InstallCommand string `mapstructure:"install_command"`
|
||||||
ValidationCommand string `mapstructure:"validation_command"`
|
|
||||||
ClientCommand string `mapstructure:"client_command"`
|
|
||||||
Json map[string]interface{}
|
Json map[string]interface{}
|
||||||
PreventSudo bool `mapstructure:"prevent_sudo"`
|
NodeName string `mapstructure:"node_name"`
|
||||||
RunList []string `mapstructure:"run_list"`
|
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"`
|
SkipInstall bool `mapstructure:"skip_install"`
|
||||||
StagingDir string `mapstructure:"staging_directory"`
|
StagingDir string `mapstructure:"staging_directory"`
|
||||||
|
ValidationCommand string `mapstructure:"validation_command"`
|
||||||
|
|
||||||
tpl *packer.ConfigTemplate
|
tpl *packer.ConfigTemplate
|
||||||
}
|
}
|
||||||
|
@ -42,11 +44,6 @@ type Provisioner struct {
|
||||||
type ConfigTemplate struct {
|
type ConfigTemplate struct {
|
||||||
NodeName string
|
NodeName string
|
||||||
ServerUrl 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 {
|
type ExecuteTemplate struct {
|
||||||
|
@ -72,19 +69,19 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
|
||||||
p.config.tpl.UserVars = p.config.PackerUserVars
|
p.config.tpl.UserVars = p.config.PackerUserVars
|
||||||
|
|
||||||
if p.config.ExecuteCommand == "" {
|
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 == "" {
|
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 == "" {
|
if p.config.ValidationCommand == "" {
|
||||||
p.config.ValidationCommand = "{{if .Sudo}}sudo {{end}} mv /tmp/validation.pem /etc/chef/validation.pem"
|
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"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if p.config.RunList == nil {
|
if p.config.RunList == nil {
|
||||||
|
@ -133,7 +130,6 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
|
||||||
"execute_command": &p.config.ExecuteCommand,
|
"execute_command": &p.config.ExecuteCommand,
|
||||||
"install_command": &p.config.InstallCommand,
|
"install_command": &p.config.InstallCommand,
|
||||||
"validation_command": &p.config.ValidationCommand,
|
"validation_command": &p.config.ValidationCommand,
|
||||||
"client_command": &p.config.ClientCommand,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for n, ptr := range validates {
|
for n, ptr := range validates {
|
||||||
|
@ -175,31 +171,17 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
|
||||||
return fmt.Errorf("Error installing Chef: %s", err)
|
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 {
|
if err := p.createDir(ui, comm, p.config.StagingDir); err != nil {
|
||||||
return fmt.Errorf("Error creating staging directory: %s", err)
|
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 {
|
if err := p.moveValidation(ui, comm); err != nil {
|
||||||
return fmt.Errorf("Error moving validation.pem: %s", err)
|
return fmt.Errorf("Error moving validation.pem: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
nodeName := ""
|
nodeName := p.config.NodeName
|
||||||
if p.config.NodeName != "" {
|
serverUrl := p.config.ServerUrl
|
||||||
nodeName = fmt.Sprintf("%s", p.config.NodeName)
|
|
||||||
}
|
|
||||||
|
|
||||||
serverUrl := ""
|
|
||||||
if p.config.ServerUrl != "" {
|
|
||||||
serverUrl = fmt.Sprintf("%s", p.config.ServerUrl)
|
|
||||||
}
|
|
||||||
|
|
||||||
configPath, err := p.createConfig(ui, comm, nodeName, serverUrl)
|
configPath, err := p.createConfig(ui, comm, nodeName, serverUrl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -211,26 +193,23 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
|
||||||
return fmt.Errorf("Error creating JSON attributes: %s", err)
|
return fmt.Errorf("Error creating JSON attributes: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := p.executeChef(ui, comm, configPath, jsonPath); err != nil {
|
err = p.executeChef(ui, comm, configPath, jsonPath)
|
||||||
if err2 := p.cleanNode(ui, comm, p.config.NodeName); err2 != nil {
|
if !p.config.SkipCleanNode {
|
||||||
|
if err2 := p.cleanNode(ui, comm, nodeName); err2 != nil {
|
||||||
return fmt.Errorf("Error cleaning up chef node: %s", err2)
|
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 cleaning up chef client: %s", err2)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
return fmt.Errorf("Error executing Chef: %s", err)
|
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 := p.removeDir(ui, comm, p.config.StagingDir); err != nil {
|
if err := p.removeDir(ui, comm, p.config.StagingDir); err != nil {
|
||||||
return fmt.Errorf("Error removing /etc/chef directory: %s", err)
|
return fmt.Errorf("Error removing /etc/chef directory: %s", err)
|
||||||
}
|
}
|
||||||
|
@ -279,9 +258,8 @@ func (p *Provisioner) createConfig(ui packer.Ui, comm packer.Communicator, nodeN
|
||||||
}
|
}
|
||||||
|
|
||||||
configString, err := p.config.tpl.Process(tpl, &ConfigTemplate{
|
configString, err := p.config.tpl.Process(tpl, &ConfigTemplate{
|
||||||
NodeName: nodeName,
|
NodeName: nodeName,
|
||||||
ServerUrl: serverUrl,
|
ServerUrl: serverUrl,
|
||||||
HasNodeName: nodeName != "",
|
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
|
@ -341,19 +319,6 @@ func (p *Provisioner) createDir(ui packer.Ui, comm packer.Communicator, dir stri
|
||||||
return nil
|
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 {
|
func (p *Provisioner) cleanNode(ui packer.Ui, comm packer.Communicator, node string) error {
|
||||||
ui.Say("Cleaning up chef node...")
|
ui.Say("Cleaning up chef node...")
|
||||||
app := "knife node delete -y " + node
|
app := "knife node delete -y " + node
|
||||||
|
@ -472,29 +437,6 @@ func (p *Provisioner) moveValidation(ui packer.Ui, comm packer.Communicator) err
|
||||||
return nil
|
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) {
|
func (p *Provisioner) processJsonUserVars() (map[string]interface{}, error) {
|
||||||
jsonBytes, err := json.Marshal(p.config.Json)
|
jsonBytes, err := json.Marshal(p.config.Json)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -540,7 +482,7 @@ log_level :info
|
||||||
log_location STDOUT
|
log_location STDOUT
|
||||||
chef_server_url "{{.ServerUrl}}"
|
chef_server_url "{{.ServerUrl}}"
|
||||||
validation_client_name "chef-validator"
|
validation_client_name "chef-validator"
|
||||||
{{if .HasNodeName}}
|
{{if ne .NodeName ""}}
|
||||||
node_name "{{.NodeName}}"
|
node_name "{{.NodeName}}"
|
||||||
{{end}}
|
{{end}}
|
||||||
`
|
`
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
package chefclient
|
package chefclient
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/mitchellh/packer/packer"
|
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/mitchellh/packer/packer"
|
||||||
)
|
)
|
||||||
|
|
||||||
func testConfig() map[string]interface{} {
|
func testConfig() map[string]interface{} {
|
||||||
|
@ -62,122 +63,38 @@ func TestProvisionerPrepare_configTemplate(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestProvisionerPrepare_cookbookPaths(t *testing.T) {
|
func TestProvisionerPrepare_commands(t *testing.T) {
|
||||||
var p Provisioner
|
commands := []string{
|
||||||
|
"execute_command",
|
||||||
path1, err := ioutil.TempDir("", "cookbooks_one")
|
"install_command",
|
||||||
if err != nil {
|
"validation_command",
|
||||||
t.Fatalf("err: %s", err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
path2, err := ioutil.TempDir("", "cookbooks_two")
|
for _, command := range commands {
|
||||||
if err != nil {
|
var p Provisioner
|
||||||
t.Fatalf("err: %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
rolesPath, err := ioutil.TempDir("", "roles")
|
// Test not set
|
||||||
if err != nil {
|
config := testConfig()
|
||||||
t.Fatalf("err: %s", err)
|
delete(config, command)
|
||||||
}
|
err := p.Prepare(config)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("err: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
dataBagsPath, err := ioutil.TempDir("", "data_bags")
|
// Test invalid template
|
||||||
if err != nil {
|
config = testConfig()
|
||||||
t.Fatalf("err: %s", err)
|
config[command] = "{{if NOPE}}"
|
||||||
}
|
err = p.Prepare(config)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("should error")
|
||||||
|
}
|
||||||
|
|
||||||
defer os.Remove(path1)
|
// Test good template
|
||||||
defer os.Remove(path2)
|
config = testConfig()
|
||||||
defer os.Remove(rolesPath)
|
config[command] = "{{.Foo}}"
|
||||||
defer os.Remove(dataBagsPath)
|
err = p.Prepare(config)
|
||||||
|
if err != nil {
|
||||||
config := testConfig()
|
t.Fatalf("err: %s", err)
|
||||||
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)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue