upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-05 06:42:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

remove unused user data

Browse source
This commit is contained in:
Brad Warren 2020-12-14 15:28:07 -08:00
parent 3889311557
commit 32f2751a8a
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/letstest/auto_targets.yaml
View file

@ -31,10 +31,6 @@ targets:
virt: hvm
user: admin
machine_type: a1.medium
# userdata: |
# #cloud-init
# runcmd:
# - [ apt-get, install, -y, curl ]
#-----------------------------------------------------------------------------
# Other Redhat Distros
- ami: ami-0916c408cb02e310b

11
tests/letstest/multitester.py
View file

@ -147,8 +147,7 @@ def make_instance(ec2_client,
keyname,
security_group_id,
subnet_id,
machine_type='t2.micro',
userdata=""): #userdata contains bash or cloud-init script
machine_type='t2.micro'):
block_device_mappings = _get_block_device_mappings(ec2_client, ami_id)
tags = [{'Key': 'Name', 'Value': instance_name}]
tag_spec = [{'ResourceType': 'instance', 'Tags': tags}]
@ -160,7 +159,6 @@ def make_instance(ec2_client,
KeyName=keyname,
MinCount=1,
MaxCount=1,
UserData=userdata,
InstanceType=machine_type,
TagSpecifications=tag_spec)[0]
@ -322,10 +320,6 @@ def create_client_instance(ec2_client, target, security_group_id, subnet_id):
else:
# 32 bit systems
machine_type = 'c1.medium'
if 'userdata' in target:
userdata = target['userdata']
else:
userdata = ''
name = 'le-%s'%target['name']
print(name, end=" ")
return make_instance(ec2_client,
@ -334,8 +328,7 @@ def create_client_instance(ec2_client, target, security_group_id, subnet_id):
KEYNAME,
machine_type=machine_type,
security_group_id=security_group_id,
subnet_id=subnet_id,
userdata=userdata)
subnet_id=subnet_id)
def test_client_process(fab_config, inqueue, outqueue, boulder_url, log_dir):