From 10b3d7fd9a65ff6116f7e0bca67a337a5acfebe4 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Fri, 27 Feb 2015 18:08:33 -0500 Subject: [PATCH] ec2: remove unneeded subnetid var Signed-off-by: Evan Hazlett --- drivers/amazonec2/amazonec2.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go index 8c978ee15b..a24b2aee43 100644 --- a/drivers/amazonec2/amazonec2.go +++ b/drivers/amazonec2/amazonec2.go @@ -275,11 +275,8 @@ func (d *Driver) Create() error { VolumeType: "gp2", } - // get the subnet id - subnetId := d.SubnetId - - log.Debugf("launching instance in subnet %s", subnetId) - instance, err := d.getClient().RunInstance(d.AMI, d.InstanceType, d.Zone, 1, 1, d.SecurityGroupId, d.KeyName, subnetId, bdm) + log.Debugf("launching instance in subnet %s", d.SubnetId) + instance, err := d.getClient().RunInstance(d.AMI, d.InstanceType, d.Zone, 1, 1, d.SecurityGroupId, d.KeyName, d.SubnetId, bdm) if err != nil { return fmt.Errorf("Error launching instance: %s", err) @@ -348,7 +345,6 @@ func (d *Driver) Create() error { } func (d *Driver) GetURL() (string, error) { - if d.IPAddress == "" { return "", nil }