Merge pull request #660 from CpuID/master

builder/amazon/ebs: AssociatePublicIpAddress for launching

builder/amazon/common/run_config.go

@@ -22,6 +22,7 @@ type RunConfig struct {
 	SecurityGroupId          string   `mapstructure:"security_group_id"`
 	SecurityGroupIds         []string `mapstructure:"security_group_ids"`
 	SubnetId                 string   `mapstructure:"subnet_id"`
+	AssociatePublicIpAddress bool     `mapstructure:"associate_public_ip_address"`
 	TemporaryKeyPairName     string   `mapstructure:"temporary_key_pair_name"`
 	VpcId                    string   `mapstructure:"vpc_id"`
 	AvailabilityZone         string   `mapstructure:"availability_zone"`

builder/amazon/common/ssh.go

@@ -20,8 +20,12 @@ func SSHAddress(e *ec2.EC2, port int) func(multistep.StateBag) (string, error) {
 			if i.DNSName != "" {
 				host = i.DNSName
 			} else if i.VpcId != "" {
+				if i.PublicIpAddress != "" {
+					host = i.PublicIpAddress
+				} else {
 					host = i.PrivateIpAddress
 				}
+			}
 
 			if host != "" {
 				return fmt.Sprintf("%s:%d", host, port), nil

builder/amazon/common/step_run_source_instance.go

@@ -18,6 +18,7 @@ type StepRunSourceInstance struct {
 	SourceAMI                string
 	IamInstanceProfile       string
 	SubnetId                 string
+	AssociatePublicIpAddress bool
 	AvailabilityZone         string
 	BlockDevices             BlockDevices
 
@@ -56,6 +57,7 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
 		SecurityGroups:           securityGroups,
 		IamInstanceProfile:       s.IamInstanceProfile,
 		SubnetId:                 s.SubnetId,
+		AssociatePublicIpAddress: s.AssociatePublicIpAddress,
 		BlockDevices:             s.BlockDevices.BuildLaunchDevices(),
 		AvailZone:                s.AvailabilityZone,
 	}
@@ -114,6 +116,10 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
 			ui.Message(fmt.Sprintf("Public DNS: %s", s.instance.DNSName))
 		}
 
+		if s.instance.PublicIpAddress != "" {
+			ui.Message(fmt.Sprintf("Public IP: %s", s.instance.PublicIpAddress))
+		}
+
 		if s.instance.PrivateIpAddress != "" {
 			ui.Message(fmt.Sprintf("Private IP: %s", s.instance.PrivateIpAddress))
 		}

builder/amazon/ebs/builder.go

@@ -101,6 +101,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			SourceAMI:                b.config.SourceAmi,
 			IamInstanceProfile:       b.config.IamInstanceProfile,
 			SubnetId:                 b.config.SubnetId,
+			AssociatePublicIpAddress: b.config.AssociatePublicIpAddress,
 			AvailabilityZone:         b.config.AvailabilityZone,
 			BlockDevices:             b.config.BlockDevices,
 		},

builder/amazon/instance/builder.go

@@ -204,6 +204,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			UserDataFile:             b.config.UserDataFile,
 			SourceAMI:                b.config.SourceAmi,
 			SubnetId:                 b.config.SubnetId,
+			AssociatePublicIpAddress: b.config.AssociatePublicIpAddress,
 			AvailabilityZone:         b.config.AvailabilityZone,
 			BlockDevices:             b.config.BlockDevices,
 		},

website/source/docs/builders/amazon-ebs.html.markdown

@@ -111,6 +111,10 @@ Optional:
 * `subnet_id` (string) - If using VPC, the ID of the subnet, such as
   "subnet-12345def", where Packer will launch the EC2 instance.
 
+* `associate_public_ip_address` (bool) - If using a non-default VPC, public
+  IP addresses are not provided by default. If this is toggled, your new
+	instance will get a Public IP.
+
 * `tags` (object of key/value strings) - Tags applied to the AMI.
 
 * `user_data` (string) - User data to apply when launching the instance.

website/source/docs/builders/amazon-instance.html.markdown

@@ -150,6 +150,10 @@ Optional:
 * `subnet_id` (string) - If using VPC, the ID of the subnet, such as
   "subnet-12345def", where Packer will launch the EC2 instance.
 
+* `associate_public_ip_address` (bool) - If using a non-default VPC, public
+  IP addresses are not provided by default. If this is toggled, your new
+	instance will get a Public IP.
+
 * `tags` (object of key/value strings) - Tags applied to the AMI.
 
 * `user_data` (string) - User data to apply when launching the instance.