From 9adfee5ddbd611c9fd04f631f38c2e1eeceaa380 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 5 Mar 2015 16:06:05 -0800 Subject: [PATCH] Set AWS instance Names so they match the regex --- cluster/aws/config-default.sh | 4 ++-- cluster/aws/config-test.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index fee9213e8c2..bac2839a304 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -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 diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 8a8e70af5c5..eb37d6b19d4 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -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