Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 0 additions & 158 deletions ext/cfndsl/az.rb

This file was deleted.

11 changes: 0 additions & 11 deletions ext/cfndsl/nacl.rb

This file was deleted.

23 changes: 0 additions & 23 deletions ext/cfndsl/nat.rb

This file was deleted.

59 changes: 0 additions & 59 deletions ext/cfndsl/sg.rb

This file was deleted.

1 change: 1 addition & 0 deletions vpc.cfhighlander.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

Name 'VPC'
Description "Highlander VPC component #{component_version}"
DependsOn stdext
ComponentVersion component_version
ComponentDistribution 's3://source.highlander.base2.services/components'

Expand Down
15 changes: 9 additions & 6 deletions vpc.cfndsl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,15 @@
EnableDnsHostnames true
end

dns_domain = FnJoin('.', [
Ref('EnvironmentName'), Ref('DnsDomain')
])
Condition('Route53ZoneGiven', FnNot(FnEquals(Ref('DnsDomain'),'')))

Route53_HostedZone('HostedZone') do
Name dns_domain
end
Condition('Route53ZoneGiven')
Name FnSub(dns_zone)
end unless (dns_zone.nil? or dns_zone.empty?)

EC2_DHCPOptions('DHCPOptionSet') do
DomainName dns_domain
DomainName FnSub(dns_zone) unless (dns_zone.nil? or dns_zone.empty?)
DomainNameServers ['AmazonProvidedDNS']
end

Expand Down Expand Up @@ -232,6 +231,10 @@
Value(Ref('SecurityGroupBackplane'))
Export FnSub("${EnvironmentName}-#{component_name}-SecurityGroupBackplane")
}
Output('HostedZoneId') {
Condition 'Route53ZoneGiven'
Value(Ref('HostedZone'))
}

nat_ip_list = nat_gateway_ips_list_internal(maximum_availability_zones)
Output('NatGatewayIps') {
Expand Down
8 changes: 4 additions & 4 deletions vpc.config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
#
maximum_availability_zones: 5
component_version: 1.0.3
stdext: github:toshke/hl-component-stdext

dns_zone: $EnvironmentName.$DnsDomain

subnets:
vpc_public:
allocation: 0
Expand Down Expand Up @@ -163,7 +167,3 @@ config_export:
global:
- maximum_availability_zones

lib_export:
global:
cfndsl:
- az