From 89f896cea41bb81ef30b693455c1f3c101ada9a0 Mon Sep 17 00:00:00 2001 From: Stenio Ferreira Date: Sun, 9 Dec 2018 15:42:27 -0600 Subject: [PATCH 1/2] Added custom tags to modules --- examples/nomad-consul-separate-cluster/main.tf | 5 +++++ examples/nomad-consul-separate-cluster/variables.tf | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/examples/nomad-consul-separate-cluster/main.tf b/examples/nomad-consul-separate-cluster/main.tf index 8960758..d1a304d 100644 --- a/examples/nomad-consul-separate-cluster/main.tf +++ b/examples/nomad-consul-separate-cluster/main.tf @@ -84,6 +84,7 @@ module "nomad_servers" { allowed_inbound_cidr_blocks = ["0.0.0.0/0"] ssh_key_name = "${var.ssh_key_name}" + tags = "${var.tags}" } # --------------------------------------------------------------------------------------------------------------------- @@ -128,6 +129,8 @@ module "consul_servers" { cluster_tag_key = "${var.cluster_tag_key}" cluster_tag_value = "${var.consul_cluster_name}" + tags = "${var.tags}" + ami_id = "${var.ami_id == "" ? data.aws_ami.nomad_consul.image_id : var.ami_id}" user_data = "${data.template_file.user_data_consul_server.rendered}" @@ -173,6 +176,8 @@ module "nomad_clients" { cluster_tag_key = "nomad-clients" cluster_tag_value = "${var.nomad_cluster_name}" + tags = "${var.tags}" + # To keep the example simple, we are using a fixed-size cluster. In real-world usage, you could use auto scaling # policies to dynamically resize the cluster in response to load. diff --git a/examples/nomad-consul-separate-cluster/variables.tf b/examples/nomad-consul-separate-cluster/variables.tf index 4c97383..3ed5a3a 100644 --- a/examples/nomad-consul-separate-cluster/variables.tf +++ b/examples/nomad-consul-separate-cluster/variables.tf @@ -58,3 +58,9 @@ variable "ssh_key_name" { description = "The name of an EC2 Key Pair that can be used to SSH to the EC2 Instances in this cluster. Set to an empty string to not associate a Key Pair." default = "" } + +variable "tags" { + description = "List of extra tag blocks added to the autoscaling group configuration. Each element in the list is a map containing keys 'key', 'value', and 'propagate_at_launch' mapped to the respective values." + type = "list" + default = [] +} From 1a3d1ff282cb10828af118cf68278cfe6707151f Mon Sep 17 00:00:00 2001 From: Stenio Ferreira Date: Tue, 11 Dec 2018 16:26:25 -0600 Subject: [PATCH 2/2] Updates --- examples/nomad-consul-ami/nomad-consul.json | 6 +++--- examples/nomad-consul-ami/setup_ubuntu16.sh | 12 +++--------- examples/nomad-consul-separate-cluster/main.tf | 6 +++--- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/examples/nomad-consul-ami/nomad-consul.json b/examples/nomad-consul-ami/nomad-consul.json index ea17f84..480cf89 100644 --- a/examples/nomad-consul-ami/nomad-consul.json +++ b/examples/nomad-consul-ami/nomad-consul.json @@ -2,9 +2,9 @@ "min_packer_version": "0.12.0", "variables": { "aws_region": "us-east-1", - "nomad_version": "0.7.1", - "consul_module_version": "v0.3.1", - "consul_version": "1.0.3" + "nomad_version": "0.8.6", + "consul_module_version": "master", + "consul_version": "1.4.0" }, "builders": [ { diff --git a/examples/nomad-consul-ami/setup_ubuntu16.sh b/examples/nomad-consul-ami/setup_ubuntu16.sh index 81268f8..e21e10d 100755 --- a/examples/nomad-consul-ami/setup_ubuntu16.sh +++ b/examples/nomad-consul-ami/setup_ubuntu16.sh @@ -7,13 +7,7 @@ SCRIPT=`basename "$0"` #echo "[INFO] [${SCRIPT}] Setup git" #sudo apt install -y git -# Using Docker CE directly provided by Docker -echo "[INFO] [${SCRIPT}] Setup docker" -cd /tmp/ -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - -sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" -sudo apt-get update -apt-cache policy docker-ce +# Desired Nomad drivers - Docker and Java +sudo apt install docker.io -y -sudo apt-get install -y docker-ce -sudo usermod -a -G docker ubuntu +sudo apt install -y default-jdk diff --git a/examples/nomad-consul-separate-cluster/main.tf b/examples/nomad-consul-separate-cluster/main.tf index d1a304d..d06d4d5 100644 --- a/examples/nomad-consul-separate-cluster/main.tf +++ b/examples/nomad-consul-separate-cluster/main.tf @@ -84,7 +84,7 @@ module "nomad_servers" { allowed_inbound_cidr_blocks = ["0.0.0.0/0"] ssh_key_name = "${var.ssh_key_name}" - tags = "${var.tags}" + tags = ["${var.tags}"] } # --------------------------------------------------------------------------------------------------------------------- @@ -129,7 +129,7 @@ module "consul_servers" { cluster_tag_key = "${var.cluster_tag_key}" cluster_tag_value = "${var.consul_cluster_name}" - tags = "${var.tags}" + tags = ["${var.tags}"] ami_id = "${var.ami_id == "" ? data.aws_ami.nomad_consul.image_id : var.ami_id}" user_data = "${data.template_file.user_data_consul_server.rendered}" @@ -176,7 +176,7 @@ module "nomad_clients" { cluster_tag_key = "nomad-clients" cluster_tag_value = "${var.nomad_cluster_name}" - tags = "${var.tags}" + tags = ["${var.tags}"] # To keep the example simple, we are using a fixed-size cluster. In real-world usage, you could use auto scaling # policies to dynamically resize the cluster in response to load.