Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for DHCP options set #20

Merged
merged 3 commits into from
Nov 11, 2017

Conversation

bcenker
Copy link
Contributor

@bcenker bcenker commented Nov 4, 2017

No description provided.

Copy link
Member

@antonbabenko antonbabenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few comments about naming, also run terraform fmt or use https://github.com/antonbabenko/pre-commit-terraform

main.tf Outdated
# DHCP Options Set
###################
resource "aws_vpc_dhcp_options" "this" {
count = "${ var.enable_dhcp_options ? 1 : 0 }"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. count = "${var.enable_dhcp_options ? 1 : 0 }"
  2. Add new line after count argument

main.tf Outdated
resource "aws_vpc_dhcp_options" "this" {
count = "${ var.enable_dhcp_options ? 1 : 0 }"
domain_name = "${var.dhcp_options_domain_name}"
domain_name_servers = "${var.dhcp_options_dns_servers}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename dhcp_options_dns_servers to dhcp_options_domain_name_servers

main.tf Outdated
domain_name = "${var.dhcp_options_domain_name}"
domain_name_servers = "${var.dhcp_options_dns_servers}"
ntp_servers = "${var.dhcp_options_ntp_servers}"
netbios_name_servers = "${var.dhcp_options_netbios_servers}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename dhcp_options_netbios_servers to dhcp_options_netbios_name_servers

main.tf Outdated
# DHCP Options Set Association
###############################
resource "aws_vpc_dhcp_options_association" "this" {
count = "${ var.enable_dhcp_options ? 1 : 0 }"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as for previous count

variables.tf Outdated

variable "dhcp_options_dns_servers" {
type = "list"
description = "Specify a list of DNS server addresses for DHCP options set, default to AWS provided"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reorder a bit - description, type, default

@bcenker
Copy link
Contributor Author

bcenker commented Nov 11, 2017

Hi Anton - Hopefully I addressed all the requested changes - thanks!

Copy link
Member

@antonbabenko antonbabenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor comment and then LGTM.

main.tf Outdated

vpc_id = "${aws_vpc.this.id}"
dhcp_options_id = "${aws_vpc_dhcp_options.this.id}"
depends_on = ["aws_vpc.this", "aws_vpc_dhcp_options.this"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

depends_on is not really needed here. Or, if this is this an edge case then provide an open issue link.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed - no edge case that I know of, I'm not entirely sure why I put that in there. Fixed!

@antonbabenko antonbabenko merged commit 85a47cb into terraform-aws-modules:master Nov 11, 2017
@antonbabenko
Copy link
Member

Brian, you are rock-star of the Saturday! v1.2.0 is out :)

ChairmanTubeAmp pushed a commit to Shapeways/terraform-aws-vpc that referenced this pull request Nov 28, 2017
* 'master' of github.com:Shapeways/terraform-aws-vpc:
  Reverted bad merge, fixed terraform-aws-modules#33
  Set enable_dns_support=true by default
  Updated descriptions for DNS variables (closes terraform-aws-modules#14)
  Add version requirements in README.md (fixes terraform-aws-modules#32)
  Add version requirements in README.md
  make sure outputs are always valid (terraform-aws-modules#29)
  Add tags to the aws_vpc_dhcp_options resource (terraform-aws-modules#30)
  Add support for DHCP options set (terraform-aws-modules#20)
  terraform-aws-modules#22 add vpn gateway feature (terraform-aws-modules#24)
  Add cidr_block outputs to public and private subnets (terraform-aws-modules#19)
@github-actions
Copy link

github-actions bot commented Nov 6, 2022

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 6, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants