use vpc-id and zone instead of subnet-id for ec2

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>