[AWS] Wrong assignment of `KUBE_MASTER_IP` with Elastic IP

Currently when using a custom elastic IP, the ENV var `KUBE_MASTER_IP` gets the output of `$(assign-elastic-ip $ip $master_id)` assigned. This is wrong since the command returns a string: `Attaching IP 99.999.999.999 to instance i-9999999` This patch fixes the assignment by calling `get_instance_public_ip` again.

[AWS] Wrong assignment of `KUBE_MASTER_IP` with Elastic IP
189f2436 · Thomas Ploch · 4f67b0b2 · 189f2436
Commit 189f2436 authored Dec 11, 2015 by Thomas Ploch
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

util.sh cluster/aws/util.sh +7 -2

No files found.
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -934,8 +934,13 @@ function start-master() {
      wait-for-instance-state ${master_id} "running"
      KUBE_MASTER=${MASTER_NAME}
-      KUBE_MASTER_IP=$(assign-elastic-ip $ip $master_id)
+      echo -e " ${color_green}[master running @${ip}]${color_norm}"
-      echo -e " ${color_green}[master running @${KUBE_MASTER_IP}]${color_norm}"
+      local attach_message
+      attach_message=$(assign-elastic-ip $ip $master_id)
+      # Get master ip again after attachment.
+      KUBE_MASTER_IP=$(get_instance_public_ip $master_id)
+      echo ${attach_message}
      # This is a race between instance start and volume attachment.  There appears to be no way to start an AWS instance with a volume attached.
      # To work around this, we wait for volume to be ready in setup-master-pd.sh