Merge remote-tracking branch 'origin/master' into scrape_doc_to_builder_struct_config

builder/amazon/common/step_pre_validate.go

@@ -85,19 +85,20 @@ func (s *StepPreValidate) Run(ctx context.Context, state multistep.StateBag) mul
 	ec2conn := state.Get("ec2").(*ec2.EC2)
 
 	ui.Say(fmt.Sprintf("Prevalidating AMI Name: %s", s.DestAmiName))
-	resp, err := ec2conn.DescribeImages(&ec2.DescribeImagesInput{
+	req, resp := ec2conn.DescribeImagesRequest(&ec2.DescribeImagesInput{
 		Filters: []*ec2.Filter{{
 			Name:   aws.String("name"),
 			Values: []*string{aws.String(s.DestAmiName)},
 		}}})
+	req.RetryCount = 11
 
+	err := req.Send()
 	if err != nil {
 		err := fmt.Errorf("Error querying AMI: %s", err)
 		state.Put("error", err)
 		ui.Error(err.Error())
 		return multistep.ActionHalt
 	}
-
 	if len(resp.Images) > 0 {
 		err := fmt.Errorf("Error: AMI Name: '%s' is used by an existing AMI: %s", *resp.Images[0].Name, *resp.Images[0].ImageId)
 		state.Put("error", err)

provisioner/ansible/provisioner.go

@@ -240,6 +240,10 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
 	}
 
 	hostSigner, err := newSigner(p.config.SSHHostKeyFile)
+	if err != nil {
+		return fmt.Errorf("error creating host signer: %s", err)
+	}
+
 	// Remove the private key file
 	if len(k.privKeyFile) > 0 {
 		defer os.Remove(k.privKeyFile)

provisioner/inspec/provisioner.go

@@ -217,6 +217,10 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
 	}
 
 	hostSigner, err := newSigner(p.config.SSHHostKeyFile)
+	if err != nil {
+		return fmt.Errorf("error creating host signer: %s", err)
+	}
+
 	// Remove the private key file
 	if len(k.privKeyFile) > 0 {
 		defer os.Remove(k.privKeyFile)

website/source/layouts/docs.erb

@@ -182,6 +182,9 @@
           <li<%= sidebar_current("docs-builders-profitbricks") %>>
             <a href="/docs/builders/profitbricks.html">ProfitBricks</a>
           </li>
+          <li<%= sidebar_current("docs-builders-proxmox") %>>
+            <a href="/docs/builders/proxmox.html">Proxmox</a>
+          </li>
           <li<%= sidebar_current("docs-builders-qemu") %>>
             <a href="/docs/builders/qemu.html">QEMU</a>
           </li>