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

Merge pull request #6334 from rickard-von-essen/di-docs 

digitalocean: artifact should include build region and fixed docs
This commit is contained in:
Rickard von Essen 2018-06-03 17:03:09 +02:00 committed by GitHub
parent 7bb7865a15 c0ae1b7790
commit da8668124d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builder/digitalocean/step_snapshot.go
View File

@ -111,6 +111,7 @@ func (s *stepSnapshot) Run(_ context.Context, state multistep.StateBag) multiste
ui.Error(err.Error()) ui.Error(err.Error())
return multistep.ActionHalt return multistep.ActionHalt
} }
snapshotRegions = append(snapshotRegions, c.Region)
log.Printf("Snapshot image ID: %d", imageId) log.Printf("Snapshot image ID: %d", imageId)
state.Put("snapshot_image_id", imageId) state.Put("snapshot_image_id", imageId)

7
website/source/docs/builders/digitalocean.html.md
View File

@ -73,9 +73,8 @@ builder.
for the droplet being created. This defaults to `false`, or not enabled. for the droplet being created. This defaults to `false`, or not enabled.
- `snapshot_name` (string) - The name of the resulting snapshot that will - `snapshot_name` (string) - The name of the resulting snapshot that will
appear in your account. This must be unique. To help make this unique, use a appear in your account. Defaults to "packer-{{timestamp}}" (see
function like `timestamp` (see [configuration [configuration templates](/docs/templates/engine.html) for more info).
templates](/docs/templates/engine.html) for more info)
- `snapshot_regions` (array of strings) - The regions of the resulting snapshot that will - `snapshot_regions` (array of strings) - The regions of the resulting snapshot that will
appear in your account. appear in your account.
@ -98,7 +97,7 @@ access tokens:
{ {
"type": "digitalocean", "type": "digitalocean",
"api_token": "YOUR API KEY", "api_token": "YOUR API KEY",
"image": "ubuntu-14-04-x64", "image": "ubuntu-16-04-x64",
"region": "nyc3", "region": "nyc3",
"size": "512mb", "size": "512mb",
"ssh_username": "root" "ssh_username": "root"