From 8f30225b32bb2be8683fa34e4b940768082219d1 Mon Sep 17 00:00:00 2001 From: Kris Childress Date: Wed, 26 Oct 2016 10:00:25 -0600 Subject: [PATCH] Switching over branches --- .../cloudup/_aws/topologies/private.yaml | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/upup/models/cloudup/_aws/topologies/private.yaml b/upup/models/cloudup/_aws/topologies/private.yaml index e4a00f01b5..592c9f0336 100644 --- a/upup/models/cloudup/_aws/topologies/private.yaml +++ b/upup/models/cloudup/_aws/topologies/private.yaml @@ -1,53 +1,5 @@ {{ if IsTopologyPrivate }} - vpc/{{ ClusterName }}: - id: {{ .NetworkID }} - shared: {{ SharedVPC }} - cidr: {{ .NetworkCIDR }} - enableDnsSupport: true - enableDnsHostnames: true - {{ if not SharedVPC }} - # TODO: would be good to create these as shared, to verify them - dhcpOptions/{{ ClusterName }}: - domainNameServers: AmazonProvidedDNS - {{ if eq Region "us-east-1" }} - domainName: ec2.internal - {{ else }} - domainName: {{ Region }}.compute.internal - {{ end }} - vpcDHDCPOptionsAssociation/{{ ClusterName }}: - vpc: vpc/{{ ClusterName }} - dhcpOptions: dhcpOptions/{{ ClusterName }} - {{ end }} - - internetGateway/{{ ClusterName }}: - shared: {{ SharedVPC }} - vpc: vpc/{{ ClusterName }} - - routeTable/{{ ClusterName }}: - vpc: vpc/{{ ClusterName }} - - route/0.0.0.0/0: - routeTable: routeTable/{{ ClusterName }} - cidr: 0.0.0.0/0 - internetGateway: internetGateway/{{ ClusterName }} - vpc: vpc/{{ ClusterName }} - - {{ range $zone := .Zones }} - - subnet/{{ $zone.Name }}.{{ ClusterName }}: - vpc: vpc/{{ ClusterName }} - availabilityZone: {{ $zone.Name }} - cidr: {{ $zone.CIDR }} - id: {{ $zone.ProviderID }} - shared: {{ SharedZone $zone }} - - {{ if not (SharedZone $zone) }} - routeTableAssociation/{{ $zone.Name }}.{{ ClusterName }}: - routeTable: routeTable/{{ ClusterName }} - subnet: subnet/{{ $zone.Name }}.{{ ClusterName }} - {{ end}} -{{ end }} {{ end }} \ No newline at end of file