Remove unnecessary calls

Signed-off-by: French Ben <[email protected]>

Author: French Ben

Makefile

@@ -1,5 +1,5 @@
 EDITIONS_TAG := beta11
-EDITIONS_DOCKER_VERSION := 1.13.0-RC1
+EDITIONS_DOCKER_VERSION := 1.13.0-rc1
 EDITIONS_VERSION := $(EDITIONS_DOCKER_VERSION)-$(EDITIONS_TAG)
 REGION := us-west-1
 CHANNEL := beta

aws/dockerfiles/Dockerfile.meta

@@ -6,5 +6,6 @@ RUN apk add --update ca-certificates && rm -Rf /tmp/* /var/lib/cache/apk/*
 RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
 
 ADD files/bin/metaserver /usr/local/bin/
+RUN chmod +x /usr/local/bin/metaserver
 
 CMD [ "metaserver" ]

azure/dockerfiles/Dockerfile.meta

@@ -6,5 +6,6 @@ RUN apk add --update ca-certificates && rm -Rf /tmp/* /var/lib/cache/apk/*
 RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
 
 ADD files/bin/metaserver /usr/local/bin/
+RUN chmod +x /usr/local/bin/metaserver
 
 CMD [ "metaserver" ]

azure/dockerfiles/files/guide/refresh.sh

@@ -5,37 +5,17 @@ if [ "$NODE_TYPE" == "worker" ] ; then
     exit 0
 fi
 
-get_manager_token()
-{
-    if [ -n "$MANAGER_IP" ]; then
-        export MANAGER_TOKEN=$(wget -qO- http://$MANAGER_IP:9024/token/manager/)
-        echo "MANAGER_TOKEN=$MANAGER_TOKEN"
-    else
-        echo "MANAGER_TOKEN can't be found yet. MANAGER_IP isn't set yet."
-    fi
-}
-
-get_worker_token()
-{
-    if [ -n "$MANAGER_IP" ]; then
-        export WORKER_TOKEN=$(wget -qO- http://$MANAGER_IP:9024/token/worker/)
-        echo "WORKER_TOKEN=$WORKER_TOKEN"
-    else
-        echo "WORKER_TOKEN can't be found yet. MANAGER_IP isn't set yet."
-    fi
-}
-
 IS_LEADER=$(docker node inspect self -f '{{ .ManagerStatus.Leader }}')
 
 if [[ "$IS_LEADER" == "true" ]]; then
     # we are the leader, We only need to call once, so we only call from the current leader.
     MYIP=$(ifconfig eth0 | grep "inet addr:" | cut -d: -f2 | cut -d" " -f1)
-    CURRENT_MANAGER_IP=$(python /usr/bin/azuretokens.py get-ip)
+    CURRENT_MANAGER_IP=$(python /usr/bin/azureleader.py get-ip)
     echo "Current manager IP = $CURRENT_MANAGER_IP ; my IP = $MYIP"
 
     if [ "$CURRENT_MANAGER_IP" == "$MYIP" ]; then
         echo "Swarm Manager IP changed, updating azure table with new ip"
-        python /usr/bin/azuretokens.py insert-ip $MYIP
+        python /usr/bin/azureleader.py insert-ip $MYIP
     fi
 
 fi

azure/dockerfiles/files/init/azuretokens.py renamed to azure/dockerfiles/files/init/azureleader.py

@@ -43,7 +43,7 @@ def print_ip(sa_key):
         return False
     try:
         token = tbl_svc.get_entity(TBL_NAME, PARTITION_NAME, ROW_ID)
-        print '{}'.format(token.manager_ip)
+        print('{}'.format(token.manager_ip))
         return True
     except:
         return False

azure/dockerfiles/files/init/entry.sh

@@ -28,22 +28,14 @@ get_node_id()
     echo "NODE: $NODE_ID"
 }
 
-get_tokens_db()
+get_tokens()
 {
     echo "Get MANAGER IP from Azure Table"
-    export MANAGER_IP=$(python azuretokens.py get-ip)
+    export MANAGER_IP=$(python azureleader.py get-ip)
     get_manager_token
     get_worker_token
 }
 
-get_tokens_local()
-{
-    export MANAGER_TOKEN=$(docker swarm join-token manager -q)
-    export WORKER_TOKEN=$(docker swarm join-token worker -q)
-    echo "MANAGER_TOKEN=$MANAGER_TOKEN"
-    echo "WORKER_TOKEN=$WORKER_TOKEN"
-}
-
 get_manager_token()
 {
     if [ -n "$MANAGER_IP" ]; then
@@ -69,7 +61,7 @@ confirm_primary_ready()
     n=0
     until [ $n -ge 5 ]
     do
-        get_tokens_db
+        get_tokens
         echo "PRIMARY_MANAGER_IP=$MANAGER_IP"
         # if Manager IP or manager_token is empty or manager_token is null, not ready yet.
         # token would be null for a short time between swarm init, and the time the
@@ -113,7 +105,7 @@ join_as_secondary_manager()
             n=$[$n+1]
 
             # query azure table again, incase the manager changed
-            get_tokens_db
+            get_tokens
         else
             echo "Connected to primary manager, NODE_ID=$NODE_ID , SWARM_ID=$SWARM_ID"
             break
@@ -134,21 +126,20 @@ setup_manager()
         # try to create the azure table that will store tokens, if it succeeds then it is the first
         # and it is the primary manager. If it fails, then it isn't first, and treat the record
         # that is there, as the primary manager, and join that swarm.
-        python azuretokens.py create-table
+        python azureleader.py create-table
         PRIMARY_RESULT=$?
         echo "   PRIMARY_RESULT=$PRIMARY_RESULT"
 
         if [ $PRIMARY_RESULT -eq 0 ]; then
             echo "   Primary Manager init"
             # we are the primary, so init the cluster
             docker swarm init --listen-addr $PRIVATE_IP:2377 --advertise-addr $PRIVATE_IP:2377
-            # we can now get the tokens.
-            get_tokens_local
+            # we can now get the swarm id and node id.
             get_swarm_id
             get_node_id
 
-            # update azure table with the tokens
-            python azuretokens.py insert-ip $PRIVATE_IP
+            # update azure table with the ip
+            python azureleader.py insert-ip $PRIVATE_IP
 
             echo "   Primary Manager init complete"
             # send identify message
@@ -193,7 +184,7 @@ setup_worker()
             n=$[$n+1]
 
             # query azure table again, incase the manager changed
-            get_tokens_db
+            get_tokens
         else
             echo "Connected to manager, NODE_ID=$NODE_ID , SWARM_ID=$SWARM_ID"
             break
@@ -203,7 +194,7 @@ setup_worker()
 }
 
 # init variables based on azure token table contents (if populated)
-get_tokens_db
+get_tokens
 
 # if it is a manager, setup as manager, if not, setup as worker node.
 if [ "$ROLE" == "MANAGER" ] ; then