From da0edb2aa750be5a414c635c16145db83ec39875 Mon Sep 17 00:00:00 2001 From: Nathan Sullivan Date: Tue, 26 Nov 2013 11:32:08 +1000 Subject: [PATCH 01/10] https://github.com/mitchellh/packer/issues/578 --- builder/amazon/common/run_config.go | 48 ++++++++++--------- .../amazon/common/step_run_source_instance.go | 44 +++++++++-------- builder/amazon/ebs/builder.go | 21 ++++---- builder/amazon/instance/builder.go | 21 ++++---- 4 files changed, 70 insertions(+), 64 deletions(-) diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go index 208266518..74ce76cb1 100644 --- a/builder/amazon/common/run_config.go +++ b/builder/amazon/common/run_config.go @@ -11,20 +11,21 @@ import ( // RunConfig contains configuration for running an instance from a source // AMI and details on how to access that launched image. type RunConfig struct { - SourceAmi string `mapstructure:"source_ami"` - IamInstanceProfile string `mapstructure:"iam_instance_profile"` - InstanceType string `mapstructure:"instance_type"` - UserData string `mapstructure:"user_data"` - UserDataFile string `mapstructure:"user_data_file"` - RawSSHTimeout string `mapstructure:"ssh_timeout"` - SSHUsername string `mapstructure:"ssh_username"` - SSHPort int `mapstructure:"ssh_port"` - SecurityGroupId string `mapstructure:"security_group_id"` - SecurityGroupIds []string `mapstructure:"security_group_ids"` - SubnetId string `mapstructure:"subnet_id"` - TemporaryKeyPairName string `mapstructure:"temporary_key_pair_name"` - VpcId string `mapstructure:"vpc_id"` - AvailabilityZone string `mapstructure:"availability_zone"` + SourceAmi string `mapstructure:"source_ami"` + IamInstanceProfile string `mapstructure:"iam_instance_profile"` + InstanceType string `mapstructure:"instance_type"` + UserData string `mapstructure:"user_data"` + UserDataFile string `mapstructure:"user_data_file"` + RawSSHTimeout string `mapstructure:"ssh_timeout"` + SSHUsername string `mapstructure:"ssh_username"` + SSHPort int `mapstructure:"ssh_port"` + 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"` // Unexported fields that are calculated from others sshTimeout time.Duration @@ -85,15 +86,16 @@ func (c *RunConfig) Prepare(t *packer.ConfigTemplate) []error { } templates := map[string]*string{ - "iam_instance_profile": &c.IamInstanceProfile, - "instance_type": &c.InstanceType, - "ssh_timeout": &c.RawSSHTimeout, - "ssh_username": &c.SSHUsername, - "source_ami": &c.SourceAmi, - "subnet_id": &c.SubnetId, - "temporary_key_pair_name": &c.TemporaryKeyPairName, - "vpc_id": &c.VpcId, - "availability_zone": &c.AvailabilityZone, + "iam_instance_profile": &cc.IamInstanceProfile, + "instance_type": &cc.InstanceType, + "ssh_timeout": &cc.RawSSHTimeout, + "ssh_username": &cc.SSHUsername, + "source_ami": &cc.SourceAmi, + "subnet_id": &cc.SubnetId, + "associate_public_ip_address": &cc.AssociatePublicIpAddress, + "temporary_key_pair_name": &cc.TemporaryKeyPairName, + "vpc_id": &cc.VpcId, + "availability_zone": &cc.AvailabilityZone, } for n, ptr := range templates { diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index 9d92c226c..a122318c4 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -10,16 +10,17 @@ import ( ) type StepRunSourceInstance struct { - Debug bool - ExpectedRootDevice string - InstanceType string - UserData string - UserDataFile string - SourceAMI string - IamInstanceProfile string - SubnetId string - AvailabilityZone string - BlockDevices BlockDevices + Debug bool + ExpectedRootDevice string + InstanceType string + UserData string + UserDataFile string + SourceAMI string + IamInstanceProfile string + SubnetId string + AssociatePublicIpAddress bool + AvailabilityZone string + BlockDevices BlockDevices instance *ec2.Instance } @@ -47,17 +48,18 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi } runOpts := &ec2.RunInstances{ - KeyName: keyName, - ImageId: s.SourceAMI, - InstanceType: s.InstanceType, - UserData: []byte(userData), - MinCount: 0, - MaxCount: 0, - SecurityGroups: securityGroups, - IamInstanceProfile: s.IamInstanceProfile, - SubnetId: s.SubnetId, - BlockDevices: s.BlockDevices.BuildLaunchDevices(), - AvailZone: s.AvailabilityZone, + KeyName: keyName, + ImageId: s.SourceAMI, + InstanceType: s.InstanceType, + UserData: []byte(userData), + MinCount: 0, + MaxCount: 0, + SecurityGroups: securityGroups, + IamInstanceProfile: s.IamInstanceProfile, + SubnetId: s.SubnetId, + AssociatePublicIpAddress: s.AssociatePublicIpAddress, + BlockDevices: s.BlockDevices.BuildLaunchDevices(), + AvailZone: s.AvailabilityZone, } ui.Say("Launching a source AWS instance...") diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 5d68f9470..e58392f84 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -93,16 +93,17 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe VpcId: b.config.VpcId, }, &awscommon.StepRunSourceInstance{ - Debug: b.config.PackerDebug, - ExpectedRootDevice: "ebs", - InstanceType: b.config.InstanceType, - UserData: b.config.UserData, - UserDataFile: b.config.UserDataFile, - SourceAMI: b.config.SourceAmi, - IamInstanceProfile: b.config.IamInstanceProfile, - SubnetId: b.config.SubnetId, - AvailabilityZone: b.config.AvailabilityZone, - BlockDevices: b.config.BlockDevices, + Debug: b.config.PackerDebug, + ExpectedRootDevice: "ebs", + InstanceType: b.config.InstanceType, + UserData: b.config.UserData, + UserDataFile: b.config.UserDataFile, + SourceAMI: b.config.SourceAmi, + IamInstanceProfile: b.config.IamInstanceProfile, + SubnetId: b.config.SubnetId, + AssociatePublicIpAddress: b.config.AssociatePublicIpAddress, + AvailabilityZone: b.config.AvailabilityZone, + BlockDevices: b.config.BlockDevices, }, &common.StepConnectSSH{ SSHAddress: awscommon.SSHAddress(ec2conn, b.config.SSHPort), diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 455a7cd01..bb655e629 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -196,16 +196,17 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe VpcId: b.config.VpcId, }, &awscommon.StepRunSourceInstance{ - Debug: b.config.PackerDebug, - ExpectedRootDevice: "instance-store", - InstanceType: b.config.InstanceType, - IamInstanceProfile: b.config.IamInstanceProfile, - UserData: b.config.UserData, - UserDataFile: b.config.UserDataFile, - SourceAMI: b.config.SourceAmi, - SubnetId: b.config.SubnetId, - AvailabilityZone: b.config.AvailabilityZone, - BlockDevices: b.config.BlockDevices, + Debug: b.config.PackerDebug, + ExpectedRootDevice: "instance-store", + InstanceType: b.config.InstanceType, + IamInstanceProfile: b.config.IamInstanceProfile, + UserData: b.config.UserData, + UserDataFile: b.config.UserDataFile, + SourceAMI: b.config.SourceAmi, + SubnetId: b.config.SubnetId, + AssociatePublicIpAddress: b.config.AssociatePublicIpAddress, + AvailabilityZone: b.config.AvailabilityZone, + BlockDevices: b.config.BlockDevices, }, &common.StepConnectSSH{ SSHAddress: awscommon.SSHAddress(ec2conn, b.config.SSHPort), From b3657db43ebf7f0fdd25ef9e4bacaa32fd084f41 Mon Sep 17 00:00:00 2001 From: Nathan Sullivan Date: Tue, 26 Nov 2013 11:41:39 +1000 Subject: [PATCH 02/10] docs update for https://github.com/mitchellh/packer/issues/578 --- website/source/docs/builders/amazon-ebs.html.markdown | 4 ++++ website/source/docs/builders/amazon-instance.html.markdown | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/website/source/docs/builders/amazon-ebs.html.markdown b/website/source/docs/builders/amazon-ebs.html.markdown index a050314a0..96177bfb9 100644 --- a/website/source/docs/builders/amazon-ebs.html.markdown +++ b/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. diff --git a/website/source/docs/builders/amazon-instance.html.markdown b/website/source/docs/builders/amazon-instance.html.markdown index b2caf1371..3135bf322 100644 --- a/website/source/docs/builders/amazon-instance.html.markdown +++ b/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. From 2ea61e69bc05075625db97901189fe510e41e82a Mon Sep 17 00:00:00 2001 From: Nathan Sullivan Date: Tue, 26 Nov 2013 12:05:37 +1000 Subject: [PATCH 03/10] oops bugfix for work on https://github.com/mitchellh/packer/issues/578 --- builder/amazon/common/run_config.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go index 74ce76cb1..d8b195b43 100644 --- a/builder/amazon/common/run_config.go +++ b/builder/amazon/common/run_config.go @@ -86,16 +86,16 @@ func (c *RunConfig) Prepare(t *packer.ConfigTemplate) []error { } templates := map[string]*string{ - "iam_instance_profile": &cc.IamInstanceProfile, - "instance_type": &cc.InstanceType, - "ssh_timeout": &cc.RawSSHTimeout, - "ssh_username": &cc.SSHUsername, - "source_ami": &cc.SourceAmi, - "subnet_id": &cc.SubnetId, - "associate_public_ip_address": &cc.AssociatePublicIpAddress, - "temporary_key_pair_name": &cc.TemporaryKeyPairName, - "vpc_id": &cc.VpcId, - "availability_zone": &cc.AvailabilityZone, + "iam_instance_profile": &c.IamInstanceProfile, + "instance_type": &c.InstanceType, + "ssh_timeout": &c.RawSSHTimeout, + "ssh_username": &c.SSHUsername, + "source_ami": &c.SourceAmi, + "subnet_id": &c.SubnetId, + "associate_public_ip_address": &c.AssociatePublicIpAddress, + "temporary_key_pair_name": &c.TemporaryKeyPairName, + "vpc_id": &c.VpcId, + "availability_zone": &c.AvailabilityZone, } for n, ptr := range templates { From 6e619d73516aa562a744e74e1a73f52f9d3aed52 Mon Sep 17 00:00:00 2001 From: Nathan Sullivan Date: Tue, 26 Nov 2013 13:44:39 +1000 Subject: [PATCH 04/10] lets try a string instead of a bool for AssociatePublicIpAddress --- builder/amazon/chroot/builder.go | 2 +- builder/amazon/chroot/step_attach_volume.go | 2 +- builder/amazon/chroot/step_create_volume.go | 2 +- builder/amazon/chroot/step_instance_info.go | 4 ++-- builder/amazon/chroot/step_register_ami.go | 2 +- builder/amazon/chroot/step_snapshot.go | 2 +- builder/amazon/chroot/step_source_ami_info.go | 2 +- builder/amazon/common/access_config.go | 2 +- builder/amazon/common/ami_config.go | 2 +- builder/amazon/common/artifact.go | 4 ++-- builder/amazon/common/block_device.go | 2 +- builder/amazon/common/block_device_test.go | 2 +- builder/amazon/common/run_config.go | 2 +- builder/amazon/common/ssh.go | 2 +- builder/amazon/common/state.go | 2 +- builder/amazon/common/step_ami_region_copy.go | 4 ++-- builder/amazon/common/step_create_tags.go | 4 ++-- builder/amazon/common/step_key_pair.go | 2 +- builder/amazon/common/step_modify_ami_attributes.go | 4 ++-- builder/amazon/common/step_run_source_instance.go | 4 ++-- builder/amazon/common/step_security_group.go | 2 +- builder/amazon/ebs/builder.go | 2 +- builder/amazon/ebs/step_create_ami.go | 2 +- builder/amazon/ebs/step_stop_instance.go | 2 +- builder/amazon/instance/builder.go | 2 +- builder/amazon/instance/step_bundle_volume.go | 2 +- builder/amazon/instance/step_register_ami.go | 2 +- 27 files changed, 33 insertions(+), 33 deletions(-) diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index e898f4173..0be428f07 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -7,7 +7,7 @@ package chroot import ( "errors" "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/common" diff --git a/builder/amazon/chroot/step_attach_volume.go b/builder/amazon/chroot/step_attach_volume.go index ab2ddb708..6c5f06c57 100644 --- a/builder/amazon/chroot/step_attach_volume.go +++ b/builder/amazon/chroot/step_attach_volume.go @@ -3,7 +3,7 @@ package chroot import ( "errors" "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go index 0b89cf642..e5e8e43cf 100644 --- a/builder/amazon/chroot/step_create_volume.go +++ b/builder/amazon/chroot/step_create_volume.go @@ -2,7 +2,7 @@ package chroot import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/chroot/step_instance_info.go b/builder/amazon/chroot/step_instance_info.go index cb694cc07..ca991e130 100644 --- a/builder/amazon/chroot/step_instance_info.go +++ b/builder/amazon/chroot/step_instance_info.go @@ -2,8 +2,8 @@ package chroot import ( "fmt" - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/aws" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" "log" diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go index cb52b646c..e4d5a7b1d 100644 --- a/builder/amazon/chroot/step_register_ami.go +++ b/builder/amazon/chroot/step_register_ami.go @@ -2,7 +2,7 @@ package chroot import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/chroot/step_snapshot.go b/builder/amazon/chroot/step_snapshot.go index e065da2df..c5c92d772 100644 --- a/builder/amazon/chroot/step_snapshot.go +++ b/builder/amazon/chroot/step_snapshot.go @@ -3,7 +3,7 @@ package chroot import ( "errors" "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/chroot/step_source_ami_info.go b/builder/amazon/chroot/step_source_ami_info.go index 32ca5fd9c..c2b5022df 100644 --- a/builder/amazon/chroot/step_source_ami_info.go +++ b/builder/amazon/chroot/step_source_ami_info.go @@ -2,7 +2,7 @@ package chroot import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go index 1690869d0..5fbf66173 100644 --- a/builder/amazon/common/access_config.go +++ b/builder/amazon/common/access_config.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "github.com/mitchellh/goamz/aws" + "github.com/CpuID/goamz/aws" "github.com/mitchellh/packer/packer" "strings" "unicode" diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go index 50e831c9d..58b1aacf0 100644 --- a/builder/amazon/common/ami_config.go +++ b/builder/amazon/common/ami_config.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "github.com/mitchellh/goamz/aws" + "github.com/CpuID/goamz/aws" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/common/artifact.go b/builder/amazon/common/artifact.go index 3913833d7..c85b7f50d 100644 --- a/builder/amazon/common/artifact.go +++ b/builder/amazon/common/artifact.go @@ -2,8 +2,8 @@ package common import ( "fmt" - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/aws" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/packer/packer" "log" "strings" diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go index 08f07e269..81d7ee3e2 100644 --- a/builder/amazon/common/block_device.go +++ b/builder/amazon/common/block_device.go @@ -1,7 +1,7 @@ package common import ( - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" ) // BlockDevice diff --git a/builder/amazon/common/block_device_test.go b/builder/amazon/common/block_device_test.go index 2e671e3d6..a66ae0f84 100644 --- a/builder/amazon/common/block_device_test.go +++ b/builder/amazon/common/block_device_test.go @@ -1,7 +1,7 @@ package common import ( - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "reflect" "testing" ) diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go index d8b195b43..45b91422a 100644 --- a/builder/amazon/common/run_config.go +++ b/builder/amazon/common/run_config.go @@ -22,7 +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"` + AssociatePublicIpAddress string `mapstructure:"associate_public_ip_address"` TemporaryKeyPairName string `mapstructure:"temporary_key_pair_name"` VpcId string `mapstructure:"vpc_id"` AvailabilityZone string `mapstructure:"availability_zone"` diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go index 5e7d8872d..9b5651c45 100644 --- a/builder/amazon/common/ssh.go +++ b/builder/amazon/common/ssh.go @@ -4,7 +4,7 @@ import ( gossh "code.google.com/p/go.crypto/ssh" "errors" "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/communicator/ssh" "time" diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go index eaa29e92d..16730b3eb 100644 --- a/builder/amazon/common/state.go +++ b/builder/amazon/common/state.go @@ -3,7 +3,7 @@ package common import ( "errors" "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "log" "time" diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go index 5ee486522..c4b0dfe11 100644 --- a/builder/amazon/common/step_ami_region_copy.go +++ b/builder/amazon/common/step_ami_region_copy.go @@ -2,8 +2,8 @@ package common import ( "fmt" - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/aws" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go index a204ca321..907fb75b9 100644 --- a/builder/amazon/common/step_create_tags.go +++ b/builder/amazon/common/step_create_tags.go @@ -2,8 +2,8 @@ package common import ( "fmt" - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/aws" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/common/step_key_pair.go b/builder/amazon/common/step_key_pair.go index 93ef6625d..42b7235b5 100644 --- a/builder/amazon/common/step_key_pair.go +++ b/builder/amazon/common/step_key_pair.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" "os" diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go index 533d4cfd9..bd699446e 100644 --- a/builder/amazon/common/step_modify_ami_attributes.go +++ b/builder/amazon/common/step_modify_ami_attributes.go @@ -2,8 +2,8 @@ package common import ( "fmt" - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/aws" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index a122318c4..4faf5f547 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" "io/ioutil" @@ -18,7 +18,7 @@ type StepRunSourceInstance struct { SourceAMI string IamInstanceProfile string SubnetId string - AssociatePublicIpAddress bool + AssociatePublicIpAddress string AvailabilityZone string BlockDevices BlockDevices diff --git a/builder/amazon/common/step_security_group.go b/builder/amazon/common/step_security_group.go index 28eb3134c..c95c877b6 100644 --- a/builder/amazon/common/step_security_group.go +++ b/builder/amazon/common/step_security_group.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/common/uuid" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index e58392f84..88730c050 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -7,7 +7,7 @@ package ebs import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/common" diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go index 9dea11317..941d19c3c 100644 --- a/builder/amazon/ebs/step_create_ami.go +++ b/builder/amazon/ebs/step_create_ami.go @@ -2,7 +2,7 @@ package ebs import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/ebs/step_stop_instance.go b/builder/amazon/ebs/step_stop_instance.go index 058c61983..2b72a1d94 100644 --- a/builder/amazon/ebs/step_stop_instance.go +++ b/builder/amazon/ebs/step_stop_instance.go @@ -2,7 +2,7 @@ package ebs import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index bb655e629..144cca46a 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -5,7 +5,7 @@ package instance import ( "errors" "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/common" diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go index 4dfbd4fc4..b13c2f3f0 100644 --- a/builder/amazon/instance/step_bundle_volume.go +++ b/builder/amazon/instance/step_bundle_volume.go @@ -2,7 +2,7 @@ package instance import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/instance/step_register_ami.go b/builder/amazon/instance/step_register_ami.go index 35f31882d..1d12ace3c 100644 --- a/builder/amazon/instance/step_register_ami.go +++ b/builder/amazon/instance/step_register_ami.go @@ -2,7 +2,7 @@ package instance import ( "fmt" - "github.com/mitchellh/goamz/ec2" + "github.com/CpuID/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" From 2f53dbe03fd424137bde954977dd015afc0c5726 Mon Sep 17 00:00:00 2001 From: Nathan Sullivan Date: Tue, 26 Nov 2013 13:46:32 +1000 Subject: [PATCH 05/10] reverting testing stuff --- builder/amazon/chroot/builder.go | 2 +- builder/amazon/chroot/step_attach_volume.go | 2 +- builder/amazon/chroot/step_create_volume.go | 2 +- builder/amazon/chroot/step_instance_info.go | 4 ++-- builder/amazon/chroot/step_register_ami.go | 2 +- builder/amazon/chroot/step_snapshot.go | 2 +- builder/amazon/chroot/step_source_ami_info.go | 2 +- builder/amazon/common/access_config.go | 2 +- builder/amazon/common/ami_config.go | 2 +- builder/amazon/common/artifact.go | 4 ++-- builder/amazon/common/block_device.go | 2 +- builder/amazon/common/block_device_test.go | 2 +- builder/amazon/common/ssh.go | 2 +- builder/amazon/common/state.go | 2 +- builder/amazon/common/step_ami_region_copy.go | 4 ++-- builder/amazon/common/step_create_tags.go | 4 ++-- builder/amazon/common/step_key_pair.go | 2 +- builder/amazon/common/step_modify_ami_attributes.go | 4 ++-- builder/amazon/common/step_run_source_instance.go | 2 +- builder/amazon/common/step_security_group.go | 2 +- builder/amazon/ebs/builder.go | 2 +- builder/amazon/ebs/step_create_ami.go | 2 +- builder/amazon/ebs/step_stop_instance.go | 2 +- builder/amazon/instance/builder.go | 2 +- builder/amazon/instance/step_bundle_volume.go | 2 +- builder/amazon/instance/step_register_ami.go | 2 +- 26 files changed, 31 insertions(+), 31 deletions(-) diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index 0be428f07..e898f4173 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -7,7 +7,7 @@ package chroot import ( "errors" "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/common" diff --git a/builder/amazon/chroot/step_attach_volume.go b/builder/amazon/chroot/step_attach_volume.go index 6c5f06c57..ab2ddb708 100644 --- a/builder/amazon/chroot/step_attach_volume.go +++ b/builder/amazon/chroot/step_attach_volume.go @@ -3,7 +3,7 @@ package chroot import ( "errors" "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go index e5e8e43cf..0b89cf642 100644 --- a/builder/amazon/chroot/step_create_volume.go +++ b/builder/amazon/chroot/step_create_volume.go @@ -2,7 +2,7 @@ package chroot import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/chroot/step_instance_info.go b/builder/amazon/chroot/step_instance_info.go index ca991e130..cb694cc07 100644 --- a/builder/amazon/chroot/step_instance_info.go +++ b/builder/amazon/chroot/step_instance_info.go @@ -2,8 +2,8 @@ package chroot import ( "fmt" - "github.com/CpuID/goamz/aws" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/aws" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" "log" diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go index e4d5a7b1d..cb52b646c 100644 --- a/builder/amazon/chroot/step_register_ami.go +++ b/builder/amazon/chroot/step_register_ami.go @@ -2,7 +2,7 @@ package chroot import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/chroot/step_snapshot.go b/builder/amazon/chroot/step_snapshot.go index c5c92d772..e065da2df 100644 --- a/builder/amazon/chroot/step_snapshot.go +++ b/builder/amazon/chroot/step_snapshot.go @@ -3,7 +3,7 @@ package chroot import ( "errors" "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/chroot/step_source_ami_info.go b/builder/amazon/chroot/step_source_ami_info.go index c2b5022df..32ca5fd9c 100644 --- a/builder/amazon/chroot/step_source_ami_info.go +++ b/builder/amazon/chroot/step_source_ami_info.go @@ -2,7 +2,7 @@ package chroot import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go index 5fbf66173..1690869d0 100644 --- a/builder/amazon/common/access_config.go +++ b/builder/amazon/common/access_config.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "github.com/CpuID/goamz/aws" + "github.com/mitchellh/goamz/aws" "github.com/mitchellh/packer/packer" "strings" "unicode" diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go index 58b1aacf0..50e831c9d 100644 --- a/builder/amazon/common/ami_config.go +++ b/builder/amazon/common/ami_config.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "github.com/CpuID/goamz/aws" + "github.com/mitchellh/goamz/aws" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/common/artifact.go b/builder/amazon/common/artifact.go index c85b7f50d..3913833d7 100644 --- a/builder/amazon/common/artifact.go +++ b/builder/amazon/common/artifact.go @@ -2,8 +2,8 @@ package common import ( "fmt" - "github.com/CpuID/goamz/aws" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/aws" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/packer/packer" "log" "strings" diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go index 81d7ee3e2..08f07e269 100644 --- a/builder/amazon/common/block_device.go +++ b/builder/amazon/common/block_device.go @@ -1,7 +1,7 @@ package common import ( - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" ) // BlockDevice diff --git a/builder/amazon/common/block_device_test.go b/builder/amazon/common/block_device_test.go index a66ae0f84..2e671e3d6 100644 --- a/builder/amazon/common/block_device_test.go +++ b/builder/amazon/common/block_device_test.go @@ -1,7 +1,7 @@ package common import ( - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "reflect" "testing" ) diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go index 9b5651c45..5e7d8872d 100644 --- a/builder/amazon/common/ssh.go +++ b/builder/amazon/common/ssh.go @@ -4,7 +4,7 @@ import ( gossh "code.google.com/p/go.crypto/ssh" "errors" "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/communicator/ssh" "time" diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go index 16730b3eb..eaa29e92d 100644 --- a/builder/amazon/common/state.go +++ b/builder/amazon/common/state.go @@ -3,7 +3,7 @@ package common import ( "errors" "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "log" "time" diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go index c4b0dfe11..5ee486522 100644 --- a/builder/amazon/common/step_ami_region_copy.go +++ b/builder/amazon/common/step_ami_region_copy.go @@ -2,8 +2,8 @@ package common import ( "fmt" - "github.com/CpuID/goamz/aws" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/aws" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go index 907fb75b9..a204ca321 100644 --- a/builder/amazon/common/step_create_tags.go +++ b/builder/amazon/common/step_create_tags.go @@ -2,8 +2,8 @@ package common import ( "fmt" - "github.com/CpuID/goamz/aws" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/aws" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/common/step_key_pair.go b/builder/amazon/common/step_key_pair.go index 42b7235b5..93ef6625d 100644 --- a/builder/amazon/common/step_key_pair.go +++ b/builder/amazon/common/step_key_pair.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" "os" diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go index bd699446e..533d4cfd9 100644 --- a/builder/amazon/common/step_modify_ami_attributes.go +++ b/builder/amazon/common/step_modify_ami_attributes.go @@ -2,8 +2,8 @@ package common import ( "fmt" - "github.com/CpuID/goamz/aws" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/aws" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index 4faf5f547..0b5fccb3c 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" "io/ioutil" diff --git a/builder/amazon/common/step_security_group.go b/builder/amazon/common/step_security_group.go index c95c877b6..28eb3134c 100644 --- a/builder/amazon/common/step_security_group.go +++ b/builder/amazon/common/step_security_group.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/common/uuid" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 88730c050..e58392f84 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -7,7 +7,7 @@ package ebs import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/common" diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go index 941d19c3c..9dea11317 100644 --- a/builder/amazon/ebs/step_create_ami.go +++ b/builder/amazon/ebs/step_create_ami.go @@ -2,7 +2,7 @@ package ebs import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/ebs/step_stop_instance.go b/builder/amazon/ebs/step_stop_instance.go index 2b72a1d94..058c61983 100644 --- a/builder/amazon/ebs/step_stop_instance.go +++ b/builder/amazon/ebs/step_stop_instance.go @@ -2,7 +2,7 @@ package ebs import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 144cca46a..bb655e629 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -5,7 +5,7 @@ package instance import ( "errors" "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/common" diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go index b13c2f3f0..4dfbd4fc4 100644 --- a/builder/amazon/instance/step_bundle_volume.go +++ b/builder/amazon/instance/step_bundle_volume.go @@ -2,7 +2,7 @@ package instance import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" "github.com/mitchellh/packer/packer" ) diff --git a/builder/amazon/instance/step_register_ami.go b/builder/amazon/instance/step_register_ami.go index 1d12ace3c..35f31882d 100644 --- a/builder/amazon/instance/step_register_ami.go +++ b/builder/amazon/instance/step_register_ami.go @@ -2,7 +2,7 @@ package instance import ( "fmt" - "github.com/CpuID/goamz/ec2" + "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" From 90f1e031fd1961c9ff51e8f44752083af8d2f487 Mon Sep 17 00:00:00 2001 From: Nathan Sullivan Date: Tue, 26 Nov 2013 14:14:43 +1000 Subject: [PATCH 06/10] goamz aspects of AssociatePublicIpAddress working now --- builder/amazon/common/run_config.go | 3 +-- builder/amazon/common/step_run_source_instance.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go index 45b91422a..423d01c82 100644 --- a/builder/amazon/common/run_config.go +++ b/builder/amazon/common/run_config.go @@ -22,7 +22,7 @@ type RunConfig struct { SecurityGroupId string `mapstructure:"security_group_id"` SecurityGroupIds []string `mapstructure:"security_group_ids"` SubnetId string `mapstructure:"subnet_id"` - AssociatePublicIpAddress string `mapstructure:"associate_public_ip_address"` + AssociatePublicIpAddress bool `mapstructure:"associate_public_ip_address"` TemporaryKeyPairName string `mapstructure:"temporary_key_pair_name"` VpcId string `mapstructure:"vpc_id"` AvailabilityZone string `mapstructure:"availability_zone"` @@ -92,7 +92,6 @@ func (c *RunConfig) Prepare(t *packer.ConfigTemplate) []error { "ssh_username": &c.SSHUsername, "source_ami": &c.SourceAmi, "subnet_id": &c.SubnetId, - "associate_public_ip_address": &c.AssociatePublicIpAddress, "temporary_key_pair_name": &c.TemporaryKeyPairName, "vpc_id": &c.VpcId, "availability_zone": &c.AvailabilityZone, diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index 0b5fccb3c..a122318c4 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -18,7 +18,7 @@ type StepRunSourceInstance struct { SourceAMI string IamInstanceProfile string SubnetId string - AssociatePublicIpAddress string + AssociatePublicIpAddress bool AvailabilityZone string BlockDevices BlockDevices From 98f7e819fdb36cebc6fd1697c96e8a5e689c3761 Mon Sep 17 00:00:00 2001 From: Nathan Sullivan Date: Tue, 26 Nov 2013 14:45:06 +1000 Subject: [PATCH 07/10] working AssociatePublicIpAddress support --- builder/amazon/common/ssh.go | 10 +++++++++- builder/amazon/common/step_run_source_instance.go | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go index 5e7d8872d..458a7226e 100644 --- a/builder/amazon/common/ssh.go +++ b/builder/amazon/common/ssh.go @@ -8,6 +8,7 @@ import ( "github.com/mitchellh/multistep" "github.com/mitchellh/packer/communicator/ssh" "time" + "log" ) // SSHAddress returns a function that can be given to the SSH communicator @@ -20,7 +21,14 @@ func SSHAddress(e *ec2.EC2, port int) func(multistep.StateBag) (string, error) { if i.DNSName != "" { host = i.DNSName } else if i.VpcId != "" { - host = i.PrivateIpAddress + log.Printf("public ip from SSHAddress: %s", i.PublicIpAddress) + if i.PublicIpAddress != "" { + log.Printf("using public ip in SSHAddress") + host = i.PublicIpAddress + } else { + log.Printf("using private ip in SSHAddress") + host = i.PrivateIpAddress + } } if host != "" { diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index a122318c4..87110130b 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -110,6 +110,7 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi } s.instance = latestInstance.(*ec2.Instance) + log.Printf("Public IP: %s", s.instance.PublicIpAddress) if s.Debug { if s.instance.DNSName != "" { From 53ea9b97bffcf25f5981927167914fef500d78a1 Mon Sep 17 00:00:00 2001 From: Nathan Sullivan Date: Tue, 26 Nov 2013 15:01:57 +1000 Subject: [PATCH 08/10] revert whitespace changes - not necessary anymore --- builder/amazon/common/run_config.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go index 423d01c82..75faed662 100644 --- a/builder/amazon/common/run_config.go +++ b/builder/amazon/common/run_config.go @@ -86,15 +86,15 @@ func (c *RunConfig) Prepare(t *packer.ConfigTemplate) []error { } templates := map[string]*string{ - "iam_instance_profile": &c.IamInstanceProfile, - "instance_type": &c.InstanceType, - "ssh_timeout": &c.RawSSHTimeout, - "ssh_username": &c.SSHUsername, - "source_ami": &c.SourceAmi, - "subnet_id": &c.SubnetId, - "temporary_key_pair_name": &c.TemporaryKeyPairName, - "vpc_id": &c.VpcId, - "availability_zone": &c.AvailabilityZone, + "iam_instance_profile": &c.IamInstanceProfile, + "instance_type": &c.InstanceType, + "ssh_timeout": &c.RawSSHTimeout, + "ssh_username": &c.SSHUsername, + "source_ami": &c.SourceAmi, + "subnet_id": &c.SubnetId, + "temporary_key_pair_name": &c.TemporaryKeyPairName, + "vpc_id": &c.VpcId, + "availability_zone": &c.AvailabilityZone, } for n, ptr := range templates { From 996a6bab012b62334fa654a1128d33e2a5572a09 Mon Sep 17 00:00:00 2001 From: Nathan Sullivan Date: Tue, 26 Nov 2013 15:02:43 +1000 Subject: [PATCH 09/10] remove excess debugging --- builder/amazon/common/ssh.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go index 458a7226e..6756c62e7 100644 --- a/builder/amazon/common/ssh.go +++ b/builder/amazon/common/ssh.go @@ -8,7 +8,6 @@ import ( "github.com/mitchellh/multistep" "github.com/mitchellh/packer/communicator/ssh" "time" - "log" ) // SSHAddress returns a function that can be given to the SSH communicator @@ -21,12 +20,9 @@ func SSHAddress(e *ec2.EC2, port int) func(multistep.StateBag) (string, error) { if i.DNSName != "" { host = i.DNSName } else if i.VpcId != "" { - log.Printf("public ip from SSHAddress: %s", i.PublicIpAddress) if i.PublicIpAddress != "" { - log.Printf("using public ip in SSHAddress") host = i.PublicIpAddress } else { - log.Printf("using private ip in SSHAddress") host = i.PrivateIpAddress } } From edff648f730be21d3ec745171e70250d1bbefbd1 Mon Sep 17 00:00:00 2001 From: Nathan Sullivan Date: Tue, 26 Nov 2013 15:03:45 +1000 Subject: [PATCH 10/10] fix some debugging for PublicIpAddress --- builder/amazon/common/step_run_source_instance.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index 87110130b..77d330a21 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -110,13 +110,16 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi } s.instance = latestInstance.(*ec2.Instance) - log.Printf("Public IP: %s", s.instance.PublicIpAddress) if s.Debug { if s.instance.DNSName != "" { 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)) }