Skip to content

Commit

Permalink
Merge pull request docker-archive#426 from nathanleclaire/revert_subnet
Browse files Browse the repository at this point in the history
Change subnet to workaround DNS server collision
  • Loading branch information
mavenugo authored Nov 4, 2016
2 parents fdc95d7 + d44619b commit 9d05e14
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions aws/cloudformation/docker_for_aws.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,19 @@

"VpcCidrs" : {
"vpc" : {
"cidr": "10.0.0.0/16"
"cidr": "172.31.0.0/16"
},
"pubsubnet1" : {
"cidr": "10.0.0.0/20"
"cidr": "172.31.0.0/20"
},
"pubsubnet2" : {
"cidr": "10.0.16.0/20"
"cidr": "172.31.16.0/20"
},
"pubsubnet3" : {
"cidr": "10.0.32.0/20"
"cidr": "172.31.32.0/20"
},
"pubsubnet4" : {
"cidr": "10.0.48.0/20"
"cidr": "172.31.48.0/20"
}
},

Expand Down
10 changes: 5 additions & 5 deletions aws/cloudformation/docker_for_aws_cloud.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,19 @@

"VpcCidrs" : {
"vpc" : {
"cidr": "10.0.0.0/16"
"cidr": "172.31.0.0/16"
},
"pubsubnet1" : {
"cidr": "10.0.0.0/20"
"cidr": "172.31.0.0/20"
},
"pubsubnet2" : {
"cidr": "10.0.16.0/20"
"cidr": "172.31.16.0/20"
},
"pubsubnet3" : {
"cidr": "10.0.32.0/20"
"cidr": "172.31.32.0/20"
},
"pubsubnet4" : {
"cidr": "10.0.48.0/20"
"cidr": "172.31.48.0/20"
}
},

Expand Down
10 changes: 5 additions & 5 deletions aws/cloudformation/docker_for_aws_ddc.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,19 @@

"VpcCidrs" : {
"vpc" : {
"cidr": "10.0.0.0/16"
"cidr": "172.31.0.0/16"
},
"pubsubnet1" : {
"cidr": "10.0.0.0/20"
"cidr": "172.31.0.0/20"
},
"pubsubnet2" : {
"cidr": "10.0.16.0/20"
"cidr": "172.31.16.0/20"
},
"pubsubnet3" : {
"cidr": "10.0.32.0/20"
"cidr": "172.31.32.0/20"
},
"pubsubnet4" : {
"cidr": "10.0.48.0/20"
"cidr": "172.31.48.0/20"
}
},

Expand Down

0 comments on commit 9d05e14

Please sign in to comment.