From 34cafbe68e7760e79a0f4216e87b41f3a34a3c60 Mon Sep 17 00:00:00 2001 From: Ben Podoll Date: Thu, 26 Sep 2013 20:24:18 -0500 Subject: [PATCH 1/6] removing the docs for digital ocean's optional param 'event_delay' as it is no longer used --- website/source/docs/builders/digitalocean.html.markdown | 5 ----- 1 file changed, 5 deletions(-) diff --git a/website/source/docs/builders/digitalocean.html.markdown b/website/source/docs/builders/digitalocean.html.markdown index 1c11d2d3b..b4793a8dd 100644 --- a/website/source/docs/builders/digitalocean.html.markdown +++ b/website/source/docs/builders/digitalocean.html.markdown @@ -35,11 +35,6 @@ Required: Optional: -* `event_delay` (string) - The delay, as a duration string, before checking - the status of an event. DigitalOcean's current API has consistency issues - where events take time to appear after being created. This defaults to "5s" - and generally shouldn't have to be changed. - * `image_id` (int) - The ID of the base image to use. This is the image that will be used to launch a new droplet and provision it. Defaults to "284203", which happens to be "Ubuntu 12.04 x64 Server." From ace8109867c78644c34d526d610f6025489d4086 Mon Sep 17 00:00:00 2001 From: Kirill Kazakov Date: Fri, 27 Sep 2013 14:27:47 +0400 Subject: [PATCH 2/6] scripts: build.sh exits without being killed by SIGTERM --- scripts/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/build.sh b/scripts/build.sh index 8ba8d3d4f..d8243eac7 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -92,3 +92,6 @@ for PLUGIN in $(find ./plugin -mindepth 1 -maxdepth 1 -type d); do done waitAll + +# Reset signal trapping to avoid "Terminated: 15" at the end +trap - SIGINT SIGTERM EXIT From 7761c9329de70ea6fee01eb256e668b9098e6828 Mon Sep 17 00:00:00 2001 From: Kirill Kazakov Date: Fri, 27 Sep 2013 19:13:55 +0400 Subject: [PATCH 3/6] provisioner/chef-solo: fix .RolesPath and .DataBagsPath in the config template --- provisioner/chef-solo/provisioner.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go index ddfc605fb..a22b18e30 100644 --- a/provisioner/chef-solo/provisioner.go +++ b/provisioner/chef-solo/provisioner.go @@ -212,7 +212,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { rolesPath := "" if p.config.RolesPath != "" { - rolesPath := fmt.Sprintf("%s/roles", p.config.StagingDir) + rolesPath = fmt.Sprintf("%s/roles", p.config.StagingDir) if err := p.uploadDirectory(ui, comm, rolesPath, p.config.RolesPath); err != nil { return fmt.Errorf("Error uploading roles: %s", err) } @@ -220,7 +220,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { dataBagsPath := "" if p.config.DataBagsPath != "" { - dataBagsPath := fmt.Sprintf("%s/data_bags", p.config.StagingDir) + dataBagsPath = fmt.Sprintf("%s/data_bags", p.config.StagingDir) if err := p.uploadDirectory(ui, comm, dataBagsPath, p.config.DataBagsPath); err != nil { return fmt.Errorf("Error uploading data bags: %s", err) } From 581a33ab7d4758d3f2f597fba11ec64c115cfb93 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 28 Sep 2013 09:39:34 +0200 Subject: [PATCH 4/6] Update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60b1780d7..ee45c62d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ BUG FIXES: * builder/amazon-chroot: Fix errors with waitin for state change. [GH-459] * communicator/ssh: SCP uploads now work properly when directories contain symlinks. [GH-449] +* provisioner/chef-solo: Data bags and roles path are now properly + populated when set. [GH-470] ## 0.3.8 (September 22, 2013) From 22a3cdb6bc3e30be0f1f3a2dd1b92e2697f9085b Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Sun, 29 Sep 2013 11:01:30 +0200 Subject: [PATCH 5/6] builder/digitalocean: error message key is "message" not "error_message" --- builder/digitalocean/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/digitalocean/api.go b/builder/digitalocean/api.go index 5abc12faa..7e09595cc 100644 --- a/builder/digitalocean/api.go +++ b/builder/digitalocean/api.go @@ -227,7 +227,7 @@ func NewRequest(d DigitalOceanClient, path string, params url.Values) (map[strin } if status == "ERROR" { - status = decodedResponse["error_message"].(string) + status = decodedResponse["message"].(string) } lastErr = errors.New(fmt.Sprintf("Received error from DigitalOcean (%d): %s", From d10a2596b8aa415e293609b19b4f6bbecfa2babf Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 29 Sep 2013 15:11:32 -0400 Subject: [PATCH 6/6] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee45c62d9..bd8d067cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ BUG FIXES: * core: default user variable values don't need to be strings. [GH-456] * builder/amazon-chroot: Fix errors with waitin for state change. [GH-459] +* builder/digitalocean: Use proper error message JSON key (DO API change). * communicator/ssh: SCP uploads now work properly when directories contain symlinks. [GH-449] * provisioner/chef-solo: Data bags and roles path are now properly