Commit 9a6b74c0 authored by Ken Barber's avatar Ken Barber

Add VPC support for acceptance test hosts for PuppetDB

This changes all the templates to provide the correct vpc/subnet ids, so our
instances are launched into a VPC instead of having public instances.
Signed-off-by: 's avatarKen Barber <ken@bob.sh>
parent f815330e
......@@ -42,5 +42,5 @@ group :test do
end
group :acceptance do
gem 'beaker', '~> 1.11'
gem 'beaker', '~> 2.2'
end
......@@ -10,6 +10,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
debian6-64-2:
roles:
- agent
......@@ -18,6 +20,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
CONFIG:
nfs_server: none
consoleport: 443
......@@ -10,6 +10,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
debian7-64-2:
roles:
- agent
......@@ -18,6 +20,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
CONFIG:
nfs_server: none
consoleport: 443
......@@ -10,6 +10,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
el5-64-2:
roles:
- agent
......@@ -18,6 +20,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
CONFIG:
nfs_server: none
consoleport: 443
......@@ -10,6 +10,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
el5-64-1:
roles:
- agent
......@@ -18,6 +20,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
ubuntu-12.04-64-1:
roles:
- agent
......@@ -26,6 +30,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
CONFIG:
nfs_server: none
consoleport: 443
......@@ -10,6 +10,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
el6-64-2:
roles:
- agent
......@@ -18,6 +20,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
CONFIG:
nfs_server: none
consoleport: 443
......@@ -10,6 +10,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
CONFIG:
nfs_server: none
......
......@@ -10,6 +10,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
el7-64-2:
roles:
- agent
......@@ -18,6 +20,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
CONFIG:
nfs_server: none
consoleport: 443
......@@ -10,6 +10,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
fedora-20-2:
roles:
- agent
......@@ -18,6 +20,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
CONFIG:
nfs_server: none
......
......@@ -10,6 +10,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
ubuntu-1004-64-2:
roles:
- agent
......@@ -18,6 +20,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
CONFIG:
nfs_server: none
consoleport: 443
......@@ -10,6 +10,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
ubuntu-1204-64-2:
roles:
- agent
......@@ -18,6 +20,8 @@ HOSTS:
amisize: c3.large
hypervisor: ec2
snapshot: foss
subnet_id: subnet-92dd65f7
vpc_id: vpc-cc4aeda9
CONFIG:
nfs_server: none
consoleport: 443
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment