diff --git a/terraform/getterraform b/terraform/getterraform new file mode 100755 index 0000000..1c315e3 --- /dev/null +++ b/terraform/getterraform @@ -0,0 +1,43 @@ +#!/bin/bash + +VERSION=${VERSION:-"1.10.5"} + + +PROGNAME="${BASH_SOURCE[0]}" +HERE="$(cd "$(dirname "$PROGNAME")" &>/dev/null && pwd)" +READIES=$(cd $HERE/.. && pwd) +. $READIES/shibumi/defs + +OS=`uname -s` +if [[ $OS == Linux ]]; then + OS=linux +elif [[ $OS == Darwin ]]; then + OS=darwin +elif [[ $OS == FreBSD ]]; then + OS=freebsd +else + echo "$OS: unsupported" +fi + +ARCH=`uname -m` +if [[ $ARCH == x86_64 ]]; then + ARCH=amd64 +elif [[ $ARCH == i686 ]]; then + ARCH=386 +elif [[ $ARCH == aarch64 ]]; then + ARCH=arm64 +elif [[ $ARCH == armv7l ]]; then + ARCH=arm +else + echo "$ARCH: unsupported" + exit 1 +fi + +dir=$(mktemp -d /tmp/tf.XXXXXX) +wget -q -O $dir/tf.zip https://releases.hashicorp.com/terraform/${VERSION}/terraform_${VERSION}_${OS}_${ARCH}.zip +cd $dir +unzip -q tf.zip +chmod +x terraform +mv terraform /usr/local/bin/ +cd $HERE +rm -rf $dir diff --git a/terraform/oss-redistimeseries-m5-spot-instances/db-resources.tf b/terraform/oss-redistimeseries-m5-spot-instances/db-resources.tf index ec7a7b9..c468ddb 100644 --- a/terraform/oss-redistimeseries-m5-spot-instances/db-resources.tf +++ b/terraform/oss-redistimeseries-m5-spot-instances/db-resources.tf @@ -31,7 +31,7 @@ resource "aws_spot_instance_request" "server" { user = var.ssh_user private_key = file(var.private_key) #need to increase timeout to larger then 5m for metal instances - timeout = "15m" + timeout = "8m" agent = "false" } } diff --git a/terraform/oss-redistimeseries-m5-spot-instances/variables.tf b/terraform/oss-redistimeseries-m5-spot-instances/variables.tf index 72bc295..a8d753e 100644 --- a/terraform/oss-redistimeseries-m5-spot-instances/variables.tf +++ b/terraform/oss-redistimeseries-m5-spot-instances/variables.tf @@ -58,7 +58,7 @@ variable "public_key" { variable "key_name" { description = "key name" - default = "perf-ci" + default = "perf-cto-us-east-2" } variable "region" { diff --git a/terraform/oss-standalone-redistimeseries-m5/variables.tf b/terraform/oss-standalone-redistimeseries-m5/variables.tf index 938c24b..d6539a4 100644 --- a/terraform/oss-standalone-redistimeseries-m5/variables.tf +++ b/terraform/oss-standalone-redistimeseries-m5/variables.tf @@ -58,7 +58,7 @@ variable "public_key" { variable "key_name" { description = "key name" - default = "perf-ci" + default = "perf-cto-us-east-2" } variable "region" {