Merge pull request #1034 from rasa/patch-1

builder/digitalocean: updated default image_id, per #1032
This commit is contained in:
Ross Smith II 2014-04-16 22:36:31 -07:00
commit 203f85bfb0
2 changed files with 3 additions and 2 deletions

View File

@ -18,6 +18,7 @@ BUG FIXES:
* builder/amazon-instance: Use S3Endpoint for ec2-upload-bundle arg,
which works for every region. [GH-904]
* builder/digitalocean: updated default image_id [GH-1032]
* builder/virtualbox-iso: Retry unregister a few times to deal with
VBoxManage randomness. [GH-915]
* provisioners/chef-client: Don't chown directory with Ubuntu. [GH-939]

View File

@ -89,8 +89,8 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
}
if b.config.ImageID == 0 {
// Default to base image "Ubuntu 12.04.3 x64 Server (id: 1505447)"
b.config.ImageID = 1505447
// Default to base image "Ubuntu 12.04.4 x64 (id: 3101045)"
b.config.ImageID = 3101045
}
if b.config.SnapshotName == "" {