From 11353f182ea2a80ef32339abe640117b82b30c7b Mon Sep 17 00:00:00 2001 From: Bob Potter Date: Sat, 4 Jan 2014 12:55:56 -0600 Subject: [PATCH 1/3] website: really fix puppet provisioner cmd docs --- website/source/docs/provisioners/puppet-masterless.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/source/docs/provisioners/puppet-masterless.html.markdown b/website/source/docs/provisioners/puppet-masterless.html.markdown index 7ff5e6836..23c07f433 100644 --- a/website/source/docs/provisioners/puppet-masterless.html.markdown +++ b/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}} ``` From 12938fe36b969a6136ed48b83a5c0faf7eee23f4 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 4 Jan 2014 11:09:41 -0800 Subject: [PATCH 2/3] builder/virtualbox,vmware: checksum not required if checksum type is none --- CHANGELOG.md | 2 ++ builder/virtualbox/iso/builder.go | 14 +++++++------- builder/vmware/iso/builder.go | 14 +++++++------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d2539247..dcb835f15 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index 1e11e9876..14e5daf65 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -175,19 +175,19 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { errs, errors.New("http_port_min must be less than http_port_max")) } - if b.config.ISOChecksum == "" { - errs = packer.MultiErrorAppend( - errs, errors.New("Due to large file sizes, an iso_checksum is required")) - } else { - 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 b.config.ISOChecksum == "" { + errs = packer.MultiErrorAppend( + errs, errors.New("Due to large file sizes, an iso_checksum is required")) + } else { + b.config.ISOChecksum = strings.ToLower(b.config.ISOChecksum) + } + if h := common.HashForType(b.config.ISOChecksumType); h == nil { errs = packer.MultiErrorAppend( errs, diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go index 9be70d4ce..06884ad89 100644 --- a/builder/vmware/iso/builder.go +++ b/builder/vmware/iso/builder.go @@ -206,19 +206,19 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { errs, errors.New("http_port_min must be less than http_port_max")) } - if b.config.ISOChecksum == "" { - errs = packer.MultiErrorAppend( - errs, errors.New("Due to large file sizes, an iso_checksum is required")) - } else { - 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 b.config.ISOChecksum == "" { + errs = packer.MultiErrorAppend( + errs, errors.New("Due to large file sizes, an iso_checksum is required")) + } else { + b.config.ISOChecksum = strings.ToLower(b.config.ISOChecksum) + } + if h := common.HashForType(b.config.ISOChecksumType); h == nil { errs = packer.MultiErrorAppend( errs, From feacecdffcf0b3b70a3aeaf42222d1171438b471 Mon Sep 17 00:00:00 2001 From: Stefan Foulis Date: Sat, 4 Jan 2014 22:24:14 +0100 Subject: [PATCH 3/3] includes information about "provider" --- website/source/docs/builders/openstack.html.markdown | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/source/docs/builders/openstack.html.markdown b/website/source/docs/builders/openstack.html.markdown index a9644367b..6391274e2 100644 --- a/website/source/docs/builders/openstack.html.markdown +++ b/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",