From a13a0ac3e8f1e1a2990496aebfe510d7e0d355cf Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Fri, 21 Aug 2015 07:57:01 -0400 Subject: [PATCH] AWS: Add disk size/type defaults to config-test Otherwise they needed to be manually specified (for example in the Jenkins jobs) --- cluster/aws/config-default.sh | 2 +- cluster/aws/config-test.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 74f90b1e9b0..ad530ed7cc0 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -42,7 +42,7 @@ MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20} # The master root EBS volume size (typically does not need to be very large) MASTER_ROOT_DISK_TYPE="${MASTER_ROOT_DISK_TYPE:-gp2}" MASTER_ROOT_DISK_SIZE=${MASTER_ROOT_DISK_SIZE:-8} -# The minions root EBS volume size (used to house Docker images +# The minions root EBS volume size (used to house Docker images) MINION_ROOT_DISK_TYPE="${MINION_ROOT_DISK_TYPE:-gp2}" MINION_ROOT_DISK_SIZE=${MINION_ROOT_DISK_SIZE:-32} diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 49a1b001628..869640d7589 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -35,6 +35,12 @@ LOG="/dev/null" MASTER_DISK_TYPE="${MASTER_DISK_TYPE:-gp2}" MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20} +# The master root EBS volume size (typically does not need to be very large) +MASTER_ROOT_DISK_TYPE="${MASTER_ROOT_DISK_TYPE:-gp2}" +MASTER_ROOT_DISK_SIZE=${MASTER_ROOT_DISK_SIZE:-8} +# The minions root EBS volume size (used to house Docker images) +MINION_ROOT_DISK_TYPE="${MINION_ROOT_DISK_TYPE:-gp2}" +MINION_ROOT_DISK_SIZE=${MINION_ROOT_DISK_SIZE:-32} MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_TAG="${INSTANCE_PREFIX}-master"