kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

update AWS Terraform configs for consistency

Browse Source
This commit is contained in:
Rob Genova
2017-11-15 19:38:50 +00:00
parent f2ad18b14d
commit 496565eb4e
5 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
terraform/aws/env/us-east/main.tf vendored
View File

@@ -22,9 +22,9 @@ variable "client_count" {
default = "4"
}
variable "cluster_tag_value" {
variable "retry_join" {
description = "Used by Consul to automatically form a cluster."
default = "auto-join"
default = "provider=aws tag_key=ConsulAutoJoin tag_value=auto-join"
}
provider "aws" {
@@ -34,22 +34,20 @@ provider "aws" {
module "hashistack" {
source = "../../modules/hashistack"
region = "${var.region}"
ami = "${var.ami}"
instance_type = "${var.instance_type}"
key_name = "${var.key_name}"
server_count = "${var.server_count}"
client_count = "${var.client_count}"
cluster_tag_value = "${var.cluster_tag_value}"
region = "${var.region}"
ami = "${var.ami}"
instance_type = "${var.instance_type}"
key_name = "${var.key_name}"
server_count = "${var.server_count}"
client_count = "${var.client_count}"
retry_join = "${var.retry_join}"
}
output "IP_Addresses" {
value = <<CONFIGURATION
Client public IPs: ${join(", ", module.hashistack.client_public_ips)}
Client private IPs: ${join(", ", module.hashistack.client_private_ips)}
Server public IPs: ${join(", ", module.hashistack.primary_server_public_ips)}
Server private IPs: ${join(", ", module.hashistack.primary_server_private_ips)}
Server public IPs: ${join(", ", module.hashistack.server_public_ips)}
To connect, add your private key and SSH into any client or server with
`ssh ubuntu@PUBLIC_IP`. You can test the integrity of the cluster by running:
@@ -67,6 +65,7 @@ executing:
Simply wait a few seconds and rerun the command if this occurs.
The Nomad UI can be accessed at http://PUBLIC_IP:4646/ui.
The Consul UI can be accessed at http://PUBLIC_IP:8500/ui.
CONFIGURATION

6
terraform/aws/env/us-east/terraform.tfvars vendored
View File

@@ -1,7 +1,7 @@
region = "us-east-1"
ami = "ami-a780afdc"
ami = "ami-6ce26316"
instance_type = "t2.medium"
key_name = "KEY_NAME"
server_count = "1"
server_count = "3"
client_count = "4"
retry_join = "provider=aws tag_key=ConsulAutoJoin tag_value=auto-join"

2
terraform/aws/env/us-east/user-data-client.sh vendored
View File

@@ -3,4 +3,4 @@
set -e
exec > >(sudo tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
sudo bash /ops/shared/scripts/client.sh "aws" "${region}" "${retry_join}"
sudo bash /ops/shared/scripts/client.sh "aws" "${retry_join}"

2
terraform/aws/env/us-east/user-data-server.sh vendored
View File

@@ -3,4 +3,4 @@
set -e
exec > >(sudo tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
sudo bash /ops/shared/scripts/server.sh "aws" "${server_count}" "${region}" "${retry_join}"
sudo bash /ops/shared/scripts/server.sh "aws" "${server_count}" "${retry_join}"

52
terraform/aws/modules/hashistack/hashistack.tf
View File

@@ -4,13 +4,13 @@ variable "instance_type" {}
variable "key_name" {}
variable "server_count" {}
variable "client_count" {}
variable "cluster_tag_value" {}
variable "retry_join" {}
data "aws_vpc" "default" {
default = true
}
resource "aws_security_group" "primary" {
resource "aws_security_group" "hashistack" {
name = "hashistack"
vpc_id = "${data.aws_vpc.default.id}"
@@ -21,7 +21,15 @@ resource "aws_security_group" "primary" {
cidr_blocks = ["0.0.0.0/0"]
}
# Consul UI
# Nomad
ingress {
from_port = 4646
to_port = 4646
protocol = "tcp"
cidr_blocks = ["0.0.0.0/0"]
}
# Consul
ingress {
from_port = 8500
to_port = 8500
@@ -68,13 +76,13 @@ resource "aws_security_group" "primary" {
}
}
data "template_file" "user_data_server_primary" {
data "template_file" "user_data_server" {
template = "${file("${path.root}/user-data-server.sh")}"
vars {
server_count = "${var.server_count}"
region = "${var.region}"
cluster_tag_value = "${var.cluster_tag_value}"
server_count = "${var.server_count}"
region = "${var.region}"
retry_join = "${var.retry_join}"
}
}
@@ -82,25 +90,25 @@ data "template_file" "user_data_client" {
template = "${file("${path.root}/user-data-client.sh")}"
vars {
region = "${var.region}"
cluster_tag_value = "${var.cluster_tag_value}"
region = "${var.region}"
retry_join = "${var.retry_join}"
}
}
resource "aws_instance" "primary" {
resource "aws_instance" "server" {
ami = "${var.ami}"
instance_type = "${var.instance_type}"
key_name = "${var.key_name}"
vpc_security_group_ids = ["${aws_security_group.primary.id}"]
vpc_security_group_ids = ["${aws_security_group.hashistack.id}"]
count = "${var.server_count}"
#Instance tags
tags {
Name = "hashistack-server-${count.index}"
ConsulAutoJoin = "${var.cluster_tag_value}"
ConsulAutoJoin = "auto-join"
}
user_data = "${data.template_file.user_data_server_primary.rendered}"
user_data = "${data.template_file.user_data_server.rendered}"
iam_instance_profile = "${aws_iam_instance_profile.instance_profile.name}"
}
@@ -108,14 +116,14 @@ resource "aws_instance" "client" {
ami = "${var.ami}"
instance_type = "${var.instance_type}"
key_name = "${var.key_name}"
vpc_security_group_ids = ["${aws_security_group.primary.id}"]
vpc_security_group_ids = ["${aws_security_group.hashistack.id}"]
count = "${var.client_count}"
depends_on = ["aws_instance.primary"]
depends_on = ["aws_instance.server"]
#Instance tags
tags {
Name = "hashistack-client-${count.index}"
ConsulAutoJoin = "${var.cluster_tag_value}"
ConsulAutoJoin = "auto-join"
}
user_data = "${data.template_file.user_data_client.rendered}"
@@ -164,16 +172,8 @@ data "aws_iam_policy_document" "auto_discover_cluster" {
}
}
output "primary_server_private_ips" {
value = ["${aws_instance.primary.*.private_ip}"]
}
output "primary_server_public_ips" {
value = ["${aws_instance.primary.*.public_ip}"]
}
output "client_private_ips" {
value = ["${aws_instance.client.*.private_ip}"]
output "server_public_ips" {
value = ["${aws_instance.server.*.public_ip}"]
}
output "client_public_ips" {