Merge pull request #4341 from danmcp/master

Merged by openshift-bot

Author: OpenShift Bot

Vagrantfile

@@ -300,6 +300,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         aws.keypair_name      = aws_creds["AWSKeyPairName"] || "AWS KEYPAIR NAME"
         aws.ami               = voc['ami']
         aws.region            = voc['ami_region']
+        aws.subnet_id         = ENV['AWS_SUBNET_ID'] || vagrant_openshift_config['aws']['subnet_id'] || "subnet-cf57c596"
         aws.instance_type     = vagrant_openshift_config['instance_type'] || "c3.large"
         aws.instance_ready_timeout = 240
         aws.tags              = { "Name" => ENV['AWS_HOSTNAME'] || vagrant_openshift_config['instance_name'] }