Merge pull request #5378 from justinsb/aws_instance_type

Allow the AWS instance type to be specified via MASTER_SIZE, MINION_SIZE
This commit is contained in:
Alex Robinson 2015-03-12 09:55:06 -07:00
commit 4ad0ec365e
2 changed files with 4 additions and 4 deletions

View File

@ -16,8 +16,8 @@
# TODO: the zone isn't quite piped into all the right places...
ZONE=${KUBE_AWS_ZONE:-us-west-2}
MASTER_SIZE=t2.micro
MINION_SIZE=t2.micro
MASTER_SIZE=${MASTER_SIZE:-t2.micro}
MINION_SIZE=${MINION_SIZE:-t2.micro}
NUM_MINIONS=${NUM_MINIONS:-4}
# This is the ubuntu 14.04 image for us-west-2 + ebs

View File

@ -16,8 +16,8 @@
# TODO: this isn't quite piped into all the right places...
ZONE=${KUBE_AWS_ZONE:-us-west-2}
MASTER_SIZE=t2.micro
MINION_SIZE=t2.micro
MASTER_SIZE=${MASTER_SIZE:-t2.micro}
MINION_SIZE=${MINION_SIZE:-t2.micro}
NUM_MINIONS=${NUM_MINIONS:-2}
# This is the ubuntu 14.04 image for us-west-2 + ebs