Merge branch 'master' of https://github.com/mitchellh/packer into docker-metadata

CHANGELOG.md

@@ -3,6 +3,8 @@
 BUG FIXES:
 
 * builders/docker: user variables work properly. [GH-777]
+* builder/virtualbox,vmware: iso\_checksum is not required if the
+  checksum type is "none"
 
 ## 0.5.1 (01/02/2014)
 

builder/virtualbox/iso/builder.go

@@ -175,6 +175,12 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 			errs, errors.New("http_port_min must be less than http_port_max"))
 	}
 
+	if b.config.ISOChecksumType == "" {
+		errs = packer.MultiErrorAppend(
+			errs, errors.New("The iso_checksum_type must be specified."))
+	} else {
+		b.config.ISOChecksumType = strings.ToLower(b.config.ISOChecksumType)
+		if b.config.ISOChecksumType != "none" {
 			if b.config.ISOChecksum == "" {
 				errs = packer.MultiErrorAppend(
 					errs, errors.New("Due to large file sizes, an iso_checksum is required"))
@@ -182,12 +188,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 				b.config.ISOChecksum = strings.ToLower(b.config.ISOChecksum)
 			}
 
-	if b.config.ISOChecksumType == "" {
-		errs = packer.MultiErrorAppend(
-			errs, errors.New("The iso_checksum_type must be specified."))
-	} else {
-		b.config.ISOChecksumType = strings.ToLower(b.config.ISOChecksumType)
-		if b.config.ISOChecksumType != "none" {
 			if h := common.HashForType(b.config.ISOChecksumType); h == nil {
 				errs = packer.MultiErrorAppend(
 					errs,

builder/vmware/iso/builder.go

@@ -206,6 +206,12 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 			errs, errors.New("http_port_min must be less than http_port_max"))
 	}
 
+	if b.config.ISOChecksumType == "" {
+		errs = packer.MultiErrorAppend(
+			errs, errors.New("The iso_checksum_type must be specified."))
+	} else {
+		b.config.ISOChecksumType = strings.ToLower(b.config.ISOChecksumType)
+		if b.config.ISOChecksumType != "none" {
 			if b.config.ISOChecksum == "" {
 				errs = packer.MultiErrorAppend(
 					errs, errors.New("Due to large file sizes, an iso_checksum is required"))
@@ -213,12 +219,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 				b.config.ISOChecksum = strings.ToLower(b.config.ISOChecksum)
 			}
 
-	if b.config.ISOChecksumType == "" {
-		errs = packer.MultiErrorAppend(
-			errs, errors.New("The iso_checksum_type must be specified."))
-	} else {
-		b.config.ISOChecksumType = strings.ToLower(b.config.ISOChecksumType)
-		if b.config.ISOChecksumType != "none" {
 			if h := common.HashForType(b.config.ISOChecksumType); h == nil {
 				errs = packer.MultiErrorAppend(
 					errs,

website/source/docs/builders/openstack.html.markdown

@@ -37,7 +37,8 @@ Required:
 
 * `provider` (string) - The provider used to connect to the OpenStack service.
   If not specified, Packer will attempt to read this from the
-  `SDK_PROVIDER` environment variable.
+  `SDK_PROVIDER` environment variable. For Rackspace this should be `rackspace-us`
+  or `rackspace-uk`.
 
 * `region` (string) - The name of the region, such as "DFW", in which
   to launch the server to create the AMI.
@@ -74,7 +75,7 @@ Ubuntu 12.04 LTS (Precise Pangolin) on Rackspace OpenStack cloud offering.
   "type": "openstack",
   "username": "",
   "password": "",
-  "provider": "",
+  "provider": "rackspace-us",
   "region": "DFW",
   "ssh_username": "root",
   "image_name": "Test image",

website/source/docs/provisioners/puppet-masterless.html.markdown

@@ -88,6 +88,7 @@ for readability) to execute Puppet:
   --modulepath='{{.ModulePath}}' \
   {{if ne .HieraConfigPath ""}}--hiera_config='{{.HieraConfigPath}}' {{end}} \
   {{if ne .ManifestDir ""}}--manifestdir='{{.ManifestDir}}' {{end}} \
+  --detailed-exitcodes \
   {{.ManifestFile}}
 ```