vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

check for VPC subnet ID before using builder VPC

Browse source 
This means you can use legacy networking machines by simply changing the
instance type and removing the specified 'EC2_VPC_SUBNET_ID' from the
executor config.
This commit is contained in:
Jimmy Zelinskie 2015-10-22 14:50:54 -04:00
parent 1d5170f626
commit 46b2f10d7f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
buildman/manager/executor.py
View file

@ -121,12 +121,14 @@ class EC2Executor(BuilderExecutor):
block_devices = boto.ec2.blockdevicemapping.BlockDeviceMapping() block_devices = boto.ec2.blockdevicemapping.BlockDeviceMapping()
block_devices['/dev/xvda'] = ssd_root_ebs block_devices['/dev/xvda'] = ssd_root_ebs
interface = boto.ec2.networkinterface.NetworkInterfaceSpecification( interfaces = None
subnet_id=self.executor_config['EC2_VPC_SUBNET_ID'], if self.executor_config.get('EC2_VPC_SUBNET_ID', None) is not None:
groups=self.executor_config['EC2_SECURITY_GROUP_IDS'], interface = boto.ec2.networkinterface.NetworkInterfaceSpecification(
associate_public_ip_address=True, subnet_id=self.executor_config['EC2_VPC_SUBNET_ID'],
) groups=self.executor_config['EC2_SECURITY_GROUP_IDS'],
interfaces = boto.ec2.networkinterface.NetworkInterfaceCollection(interface) associate_public_ip_address=True,
)
interfaces = boto.ec2.networkinterface.NetworkInterfaceCollection(interface)
reservation = yield From(ec2_conn.run_instances( reservation = yield From(ec2_conn.run_instances(
coreos_ami, coreos_ami,