Merge pull request #5114 from justinsb/aws_set_instance_names

Set AWS instance Names so they match the regex
This commit is contained in:
Brendan Burns 2015-03-06 15:26:36 +01:00
commit 7cb70b0a98
2 changed files with 4 additions and 4 deletions

View File

@ -30,10 +30,10 @@ IAM_PROFILE="kubernetes"
LOG="/dev/null"
MASTER_NAME="ip-172-20-0-9.$ZONE.compute.internal"
MASTER_NAME="${INSTANCE_PREFIX}-master"
MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
MASTER_TAG="${INSTANCE_PREFIX}-master"
MINION_TAG="${INSTANCE_PREFIX}-minion"
MINION_NAMES=($(eval echo ip-172-20-0-1{0..$(($NUM_MINIONS-1))}.$ZONE.compute.internal))
MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
MINION_SCOPES=""
POLL_SLEEP_INTERVAL=3

View File

@ -30,10 +30,10 @@ IAM_PROFILE="kubernetes"
LOG="/dev/null"
MASTER_NAME="ip-172-20-0-9.$ZONE.compute.internal"
MASTER_NAME="${INSTANCE_PREFIX}-master"
MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
MASTER_TAG="${INSTANCE_PREFIX}-master"
MINION_TAG="${INSTANCE_PREFIX}-minion"
MINION_NAMES=($(eval echo ip-172-20-0-1{0..$(($NUM_MINIONS-1))}.$ZONE.compute.internal))
MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
MINION_SCOPES=""
POLL_SLEEP_INTERVAL=3