From 1bb019423dea51e7dddb5f87954c336dfc800f89 Mon Sep 17 00:00:00 2001 From: Sathiya Shunmugasundaram Date: Mon, 1 Jun 2015 01:26:50 -0400 Subject: [PATCH] Adding rhel scripts and changes for rhel paramaters --- terraform/aws/consul.tf | 5 +-- terraform/aws/scripts/rhel/install.sh | 36 ++++++++++++++++++++ terraform/aws/scripts/rhel/server.sh | 15 ++++++++ terraform/aws/scripts/rhel/service.sh | 5 +++ terraform/aws/scripts/rhel/upstart-join.conf | 25 ++++++++++++++ terraform/aws/scripts/rhel/upstart.conf | 28 +++++++++++++++ terraform/aws/variables.tf | 25 ++++++++++++-- 7 files changed, 134 insertions(+), 5 deletions(-) create mode 100644 terraform/aws/scripts/rhel/install.sh create mode 100755 terraform/aws/scripts/rhel/server.sh create mode 100755 terraform/aws/scripts/rhel/service.sh create mode 100644 terraform/aws/scripts/rhel/upstart-join.conf create mode 100644 terraform/aws/scripts/rhel/upstart.conf diff --git a/terraform/aws/consul.tf b/terraform/aws/consul.tf index 23a4b05de..1176f833a 100644 --- a/terraform/aws/consul.tf +++ b/terraform/aws/consul.tf @@ -1,12 +1,13 @@ resource "aws_instance" "server" { - ami = "${lookup(var.ami, var.region)}" + ami = "${lookup(var.ami, concat(var.region, "-", var.platform))}" + #ami = "${lookup(var.ami, var.region, var.platform)}" instance_type = "${var.instance_type}" key_name = "${var.key_name}" count = "${var.servers}" security_groups = ["${aws_security_group.consul.name}"] connection { - user = "ubuntu" + user = "${lookup(var.user, var.platform)}" key_file = "${var.key_path}" } diff --git a/terraform/aws/scripts/rhel/install.sh b/terraform/aws/scripts/rhel/install.sh new file mode 100644 index 000000000..9b4d1c5f1 --- /dev/null +++ b/terraform/aws/scripts/rhel/install.sh @@ -0,0 +1,36 @@ +#!/bin/bash +set -e + +# Read the address to join from the file we provisioned +JOIN_ADDRS=$(cat /tmp/consul-server-addr | tr -d '\n') + +echo "Installing dependencies..." +sudo yum update -y +sudo yum install -y unzip wget + +echo "Fetching Consul..." +cd /tmp +wget https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip -O consul.zip + +echo "Installing Consul..." +unzip consul.zip >/dev/null +sudo chmod +x consul +sudo mv consul /usr/local/bin/consul +sudo mkdir -p /etc/consul.d +sudo mkdir -p /mnt/consul +sudo mkdir -p /etc/service + +# Setup the join address +cat >/tmp/consul-join << EOF +export CONSUL_JOIN="${JOIN_ADDRS}" +EOF +sudo mv /tmp/consul-join /etc/service/consul-join +chmod 0644 /etc/service/consul-join + +echo "Installing Upstart service..." +sudo chown root:root /tmp/upstart.conf +sudo chown root:root /tmp/upstart-join.conf +sudo mv /tmp/upstart.conf /etc/init/consul.conf +sudo mv /tmp/upstart-join.conf /etc/init/consul-join.conf +echo "Installed upstart" +sudo initctl list diff --git a/terraform/aws/scripts/rhel/server.sh b/terraform/aws/scripts/rhel/server.sh new file mode 100755 index 000000000..80057cbf8 --- /dev/null +++ b/terraform/aws/scripts/rhel/server.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -e + +# Read from the file we created +SERVER_COUNT=$(cat /tmp/consul-server-count | tr -d '\n') + +# Write the flags to a temporary file +cat >/tmp/consul_flags << EOF +export CONSUL_FLAGS="-server -bootstrap-expect=${SERVER_COUNT} -data-dir=/mnt/consul" +EOF + +# Write it to the full service file +sudo mv /tmp/consul_flags /etc/service/consul +sudo chown root:root /etc/service/consul +sudo chmod 0644 /etc/service/consul diff --git a/terraform/aws/scripts/rhel/service.sh b/terraform/aws/scripts/rhel/service.sh new file mode 100755 index 000000000..7c186e97a --- /dev/null +++ b/terraform/aws/scripts/rhel/service.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -e + +echo "Starting Consul..." +sudo start consul diff --git a/terraform/aws/scripts/rhel/upstart-join.conf b/terraform/aws/scripts/rhel/upstart-join.conf new file mode 100644 index 000000000..16343d875 --- /dev/null +++ b/terraform/aws/scripts/rhel/upstart-join.conf @@ -0,0 +1,25 @@ +description "Join the consul cluster" + +start on started consul +stop on stopped consul + +task + +script + if [ -f "/etc/service/consul-join" ]; then + . /etc/service/consul-join + fi + + # Keep trying to join until it succeeds + set +e + while :; do + logger -t "consul-join" "Attempting join: ${CONSUL_JOIN}" + /usr/local/bin/consul join \ + ${CONSUL_JOIN} \ + >>/var/log/consul-join.log 2>&1 + [ $? -eq 0 ] && break + sleep 5 + done + + logger -t "consul-join" "Join success!" +end script diff --git a/terraform/aws/scripts/rhel/upstart.conf b/terraform/aws/scripts/rhel/upstart.conf new file mode 100644 index 000000000..bc335b18a --- /dev/null +++ b/terraform/aws/scripts/rhel/upstart.conf @@ -0,0 +1,28 @@ +description "Consul agent" + +start on runlevel [2345] +stop on runlevel [!2345] + +respawn +# This is to avoid Upstart re-spawning the process upon `consul leave` +normal exit 0 INT +# stop consul will not mark node as failed but left +#kill signal INT + +script + if [ -f "/etc/service/consul" ]; then + . /etc/service/consul + fi + + # Make sure to use all our CPUs, because Consul can block a scheduler thread + export GOMAXPROCS=`nproc` + + # Get the public IP + BIND=`ifconfig eth0 | grep "inet addr" | awk '{ print substr($2,6) }'` + + exec /usr/local/bin/consul agent \ + -config-dir="/etc/consul.d" \ + -bind=$BIND \ + ${CONSUL_FLAGS} \ + >>/var/log/consul.log 2>&1 +end script diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf index f6d5f1767..1d31311e8 100644 --- a/terraform/aws/variables.tf +++ b/terraform/aws/variables.tf @@ -1,7 +1,26 @@ +variable "platform" { + default = "ubuntu" + description = "The region of AWS, for AMI lookups." +} + +variable "user" { + default = "ubuntu" + description = "The region of AWS, for AMI lookups." +} + +variable "user" { + default = { + ubuntu = "ubuntu" + rhel = "ec2-user" + } +} + variable "ami" { default = { - us-east-1 = "ami-3acc7a52" - us-west-2 = "ami-37501207" + us-east-1-ubuntu = "ami-3acc7a52" + us-west-2-ubuntu = "ami-37501207" + us-east-1-rhel = "ami-b0fed2d8" + us-west-2-rhel = "ami-4dbf9e7d" } } @@ -24,7 +43,7 @@ variable "servers" { } variable "instance_type" { - default = "m1.small" + default = "m3.medium" description = "The instance type to launch." }