Skip to content

Adding support for additional asg tags #21

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding support for additional asg tags #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions certs/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ data "template_file" "user_data" {

## Creates auto scaling cluster
module "cluster" {
source = "github.com/unifio/terraform-aws-asg?ref=v0.3.5//group"
source = "github.com/unifio/terraform-aws-asg?ref=v0.3.6//group"

# Resource tags
stack_item_label = "${var.stack_item_label}"
Expand All @@ -239,9 +239,10 @@ module "cluster" {
user_data = "${data.template_file.user_data.rendered}"

# ASG parameters
max_size = 2
min_size = 1
hc_grace_period = 300
min_elb_capacity = 1
load_balancers = ["${split(",",aws_elb.elb.id)}"]
additional_asg_tags = "${var.additional_asg_tags}"
Copy link
Contributor

Choose a reason for hiding this comment

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

thanks for 🔤

max_size = 2
min_size = 1
hc_grace_period = 300
min_elb_capacity = 1
load_balancers = ["${split(",",aws_elb.elb.id)}"]
}
6 changes: 6 additions & 0 deletions certs/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ variable "assign_eip" {
default = "false"
}

variable "additional_asg_tags" {
type = "list"
description = "Additional tags to apply at the ASG level, if any"
default = []
}

variable "eip_tag" {
type = "string"
description = "Tag used to lookup Elastic IP to assign"
Expand Down
17 changes: 9 additions & 8 deletions docker-openvpn-server/cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ data "template_file" "user_data" {

## Creates auto scaling cluster
module "cluster" {
source = "github.com/unifio/terraform-aws-asg?ref=v0.3.5//group"
source = "github.com/unifio/terraform-aws-asg?ref=v0.3.6//group"

# Resource tags
stack_item_label = "${var.stack_item_label}"
Expand All @@ -48,11 +48,12 @@ module "cluster" {
associate_public_ip_address = "${var.associate_public_ip_address}"

# ASG parameters
enabled_metrics = "${var.enabled_metrics}"
hc_check_type = "${var.enable_lb == "true" ? "ELB" : "EC2"}"
instance_tags = "${var.instance_tags}"
max_size = 2
min_size = 1
hc_grace_period = "${var.hc_grace_period}"
target_group_arns = "${var.lb_target_group_arns}"
additional_asg_tags = "${var.additional_asg_tags}"
enabled_metrics = "${var.enabled_metrics}"
hc_check_type = "${var.enable_lb == "true" ? "ELB" : "EC2"}"
instance_tags = "${var.instance_tags}"
max_size = 2
min_size = 1
hc_grace_period = "${var.hc_grace_period}"
target_group_arns = "${var.lb_target_group_arns}"
}
6 changes: 6 additions & 0 deletions docker-openvpn-server/cluster/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ variable "instance_tags" {
}
}

variable "additional_asg_tags" {
type = "list"
description = "Additional tags to apply at the ASG level, if any"
default = []
}

variable "enabled_metrics" {
type = "list"

Expand Down