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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Matthew Hooker 2013-09-30 04:46:15 +00:00
parent 5f19648268 b00e395516
commit 4ab4dbacf9
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,8 +4,11 @@ BUG FIXES:
* core: default user variable values don't need to be strings. [GH-456] * 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/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 * communicator/ssh: SCP uploads now work properly when directories
contain symlinks. [GH-449] 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) ## 0.3.8 (September 22, 2013)

2
builder/digitalocean/api.go
View File

@ -227,7 +227,7 @@ func NewRequest(d DigitalOceanClient, path string, params url.Values) (map[strin
} }
if status == "ERROR" { if status == "ERROR" {
status = decodedResponse["error_message"].(string) status = decodedResponse["message"].(string)
} }
lastErr = errors.New(fmt.Sprintf("Received error from DigitalOcean (%d): %s", lastErr = errors.New(fmt.Sprintf("Received error from DigitalOcean (%d): %s",

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

@ -212,7 +212,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
rolesPath := "" rolesPath := ""
if p.config.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 { if err := p.uploadDirectory(ui, comm, rolesPath, p.config.RolesPath); err != nil {
return fmt.Errorf("Error uploading roles: %s", err) return fmt.Errorf("Error uploading roles: %s", err)
} }
@ -220,7 +220,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
dataBagsPath := "" dataBagsPath := ""
if p.config.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 { if err := p.uploadDirectory(ui, comm, dataBagsPath, p.config.DataBagsPath); err != nil {
return fmt.Errorf("Error uploading data bags: %s", err) return fmt.Errorf("Error uploading data bags: %s", err)
} }

3
scripts/build.sh
View File

@ -92,3 +92,6 @@ for PLUGIN in $(find ./plugin -mindepth 1 -maxdepth 1 -type d); do
done done
waitAll waitAll
# Reset signal trapping to avoid "Terminated: 15" at the end
trap - SIGINT SIGTERM EXIT

5
website/source/docs/builders/digitalocean.html.markdown
View File

@ -35,11 +35,6 @@ Required:
Optional: 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 * `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", will be used to launch a new droplet and provision it. Defaults to "284203",
which happens to be "Ubuntu 12.04 x64 Server." which happens to be "Ubuntu 12.04 x64 Server."