From 77f2241527be4e7f2db52919a87f5f30f546348d Mon Sep 17 00:00:00 2001 From: Shane O'Grady Date: Wed, 10 Feb 2016 13:43:15 -0200 Subject: [PATCH] Fix Consul download link in Terraform scripts Use https://releases.hashicorp.com --- terraform/aws/scripts/centos6/install.sh | 5 ++++- terraform/aws/scripts/rhel6/install.sh | 7 +++++-- terraform/aws/scripts/ubuntu/install.sh | 5 ++++- terraform/openstack/scripts/install.sh | 5 ++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/terraform/aws/scripts/centos6/install.sh b/terraform/aws/scripts/centos6/install.sh index 045e07b51..9bd7e984c 100644 --- a/terraform/aws/scripts/centos6/install.sh +++ b/terraform/aws/scripts/centos6/install.sh @@ -4,13 +4,16 @@ set -e # Read the address to join from the file we provisioned JOIN_ADDRS=$(cat /tmp/consul-server-addr | tr -d '\n') +# consul version to install +CONSUL_VERSION=0.5.2 + echo "Installing dependencies..." yum update -y 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 +wget "https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip" -O consul.zip echo "Installing Consul..." unzip consul.zip >/dev/null diff --git a/terraform/aws/scripts/rhel6/install.sh b/terraform/aws/scripts/rhel6/install.sh index da4041278..43f71a94e 100644 --- a/terraform/aws/scripts/rhel6/install.sh +++ b/terraform/aws/scripts/rhel6/install.sh @@ -4,13 +4,16 @@ set -e # Read the address to join from the file we provisioned JOIN_ADDRS=$(cat /tmp/consul-server-addr | tr -d '\n') +# consul version to install +CONSUL_VERSION=0.5.2 + 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 +wget "https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip" -O consul.zip echo "Installing Consul..." unzip consul.zip >/dev/null @@ -28,7 +31,7 @@ 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.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 diff --git a/terraform/aws/scripts/ubuntu/install.sh b/terraform/aws/scripts/ubuntu/install.sh index 745b66ab6..8ec0773f8 100644 --- a/terraform/aws/scripts/ubuntu/install.sh +++ b/terraform/aws/scripts/ubuntu/install.sh @@ -4,13 +4,16 @@ set -e # Read the address to join from the file we provisioned JOIN_ADDRS=$(cat /tmp/consul-server-addr | tr -d '\n') +# consul version to install +CONSUL_VERSION=0.5.2 + echo "Installing dependencies..." sudo apt-get update -y sudo apt-get install -y unzip echo "Fetching Consul..." cd /tmp -wget https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip -O consul.zip +wget "https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip" -O consul.zip echo "Installing Consul..." unzip consul.zip >/dev/null diff --git a/terraform/openstack/scripts/install.sh b/terraform/openstack/scripts/install.sh index 5348c8aa0..c22420063 100644 --- a/terraform/openstack/scripts/install.sh +++ b/terraform/openstack/scripts/install.sh @@ -4,6 +4,9 @@ set -e # Read the address to join from the file we provisioned JOIN_ADDRS=$(cat /tmp/consul-server-addr | tr -d '\n') +# consul version to install +CONSUL_VERSION=0.5.2 + sudo sh -c 'echo "127.0.0.1 consul-node-'$(cat /tmp/consul-server-index)'" >> /etc/hosts' echo "Installing dependencies..." @@ -12,7 +15,7 @@ sudo apt-get install -y unzip echo "Fetching Consul..." cd /tmp -wget https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip -O consul.zip +wget "https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip" -O consul.zip echo "Installing Consul..." unzip consul.zip >/dev/null