Merge pull request docker-archive#475 from docker/metatoken-azure

Metatoken azure

Author: ddebroy

Makefile

@@ -1,17 +1,17 @@
-EDITIONS_TAG := beta10
-EDITIONS_DOCKER_VERSION := 1.12.3
+EDITIONS_TAG := beta11
+EDITIONS_DOCKER_VERSION := 1.13.0-rc1
 EDITIONS_VERSION := $(EDITIONS_DOCKER_VERSION)-$(EDITIONS_TAG)
 REGION := us-west-1
 CHANNEL := beta
 CHANNEL_DDC := alpha
 CHANNEL_CLOUD := alpha
 DOCKER_EXPERIMENTAL := 1
 VHD_SKU := docker4azure
-VHD_VERSION := 1.12.18
+VHD_VERSION := 1.12.20
 # stage offer will have the -preview 
 OFFER_ID := docker4azure
 CS_VHD_SKU := docker4azure-cs-1_12
-CS_VHD_VERSION := 1.0.1
+CS_VHD_VERSION := 1.0.4
 # stage offer will have the -preview 
 CS_OFFER_ID := docker4azure-cs-preview
 export
@@ -21,7 +21,13 @@ release: moby/alpine/cloud/aws/ami_id.out moby/alpine/cloud/azure/vhd_blob_url.o
 	# VHD=$(shell cat moby/alpine/cloud/azure/vhd_blob_url.out)
 
 dockerimages: buoy
+	dockerimages-aws
+	dockerimages-azure
+	
+dockerimages-aws:
 	$(MAKE) -C aws/dockerfiles
+
+dockerimages-azure:
 	$(MAKE) -C azure/dockerfiles
 
 buoy:

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

@@ -0,0 +1,11 @@
+FROM alpine:3.4
+
+RUN apk add --update ca-certificates && rm -Rf /tmp/* /var/lib/cache/apk/*
+
+# needed in order for go binary to work.
+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/build_and_push_all.sh

@@ -5,7 +5,7 @@ set -e
 NAMESPACE="${NAMESPACE:-docker4x}"
 VERSION="${VERSION:-latest}"
 
-for IMAGE in init guide create-sp ddc-init cloud logger
+for IMAGE in init guide create-sp ddc-init cloud logger meta
 do
 	FINAL_IMAGE="${NAMESPACE}/${IMAGE}-azure:${VERSION}"
 	docker build --pull -t "${FINAL_IMAGE}" -f "Dockerfile.${IMAGE}" .

azure/dockerfiles/files/guide/refresh.sh

@@ -9,17 +9,13 @@ 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.
-    DATA=$(python /usr/bin/azuretokens.py get-tokens)
-    MANAGER_IP=$(echo $DATA | cut -d'|' -f 1)
-    STORED_MANAGER_TOKEN=$(echo $DATA | cut -d'|' -f 2)
-    STORED_WORKER_TOKEN=$(echo $DATA | cut -d'|' -f 3)
+    MYIP=$(ifconfig eth0 | grep "inet addr:" | cut -d: -f2 | cut -d" " -f1)
+    CURRENT_MANAGER_IP=$(python /usr/bin/azureleader.py get-ip)
+    echo "Current manager IP = $CURRENT_MANAGER_IP ; my IP = $MYIP"
 
-    MANAGER_TOKEN=$(docker swarm join-token manager -q)
-    WORKER_TOKEN=$(docker swarm join-token worker -q)
-
-    if [[ "$STORED_MANAGER_TOKEN" != "$MANAGER_TOKEN" ]] || [[ "$STORED_WORKER_TOKEN" != "$WORKER_TOKEN" ]]; then
-        echo "Swarm tokens changed, updating azure table with new tokens"
-        python /usr/bin/azuretokens.py insert-tokens $MANAGER_IP $MANAGER_TOKEN $WORKER_TOKEN
+    if [ "$CURRENT_MANAGER_IP" == "$MYIP" ]; then
+        echo "Swarm Manager IP changed, updating azure table with new ip"
+        python /usr/bin/azureleader.py insert-ip $MYIP
     fi
 
 fi

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

@@ -36,23 +36,23 @@ def get_storage_key():
     return storage_keys['key1']
 
 
-def print_tokens(sa_key):
+def print_ip(sa_key):
     global PARTITION_NAME, ROW_ID, SA_NAME, TBL_NAME
     tbl_svc = TableService(account_name=SA_NAME, account_key=sa_key)
     if not tbl_svc.exists(TBL_NAME):
         return False
     try:
         token = tbl_svc.get_entity(TBL_NAME, PARTITION_NAME, ROW_ID)
-        print '{}|{}|{}'.format(token.manager_ip, token.manager_token, token.worker_token)
+        print('{}'.format(token.manager_ip))
         return True
     except:
         return False
 
 
-def insert_tokens(sa_key, manager_ip, manager_token, worker_token):
+def insert_ip(sa_key, manager_ip):
     global PARTITION_NAME, ROW_ID, TBL_NAME, SA_NAME
     tbl_svc = TableService(account_name=SA_NAME, account_key=sa_key)
-    token = {'PartitionKey': PARTITION_NAME, 'RowKey': ROW_ID, 'manager_ip': manager_ip, 'manager_token': manager_token, 'worker_token': worker_token}
+    token = {'PartitionKey': PARTITION_NAME, 'RowKey': ROW_ID, 'manager_ip': manager_ip}
     try:
         # this upsert operation should always succeed
         tbl_svc.insert_or_replace_entity(TBL_NAME, token)
@@ -80,11 +80,9 @@ def main():
     parser = argparse.ArgumentParser(description='Tool to store Docker Swarm info in Azure Tables')
     subparsers = parser.add_subparsers(help='commands', dest='action')
     create_table_parser = subparsers.add_parser('create-table', help='Create table specified in env var AZURE_TBL_NAME')
-    get_tokens_parser = subparsers.add_parser('get-tokens', help='Get swarm info from table specified in env var AZURE_TBL_NAME')
-    insert_tokens_parser = subparsers.add_parser('insert-tokens', help='Insert swarm info to table specified in env var AZURE_TBL_NAME')
+    get_tokens_parser = subparsers.add_parser('get-ip', help='Get swarm info from table specified in env var AZURE_TBL_NAME')
+    insert_tokens_parser = subparsers.add_parser('insert-ip', help='Insert swarm info to table specified in env var AZURE_TBL_NAME')
     insert_tokens_parser.add_argument('ip', help='IP address of the primary swarm manager')
-    insert_tokens_parser.add_argument('manager_token', help='Manager Token for the swarm')
-    insert_tokens_parser.add_argument('worker_token', help='Worker token for the swarm')
 
     args = parser.parse_args()
 
@@ -93,10 +91,10 @@ def main():
     if args.action == 'create-table':
         if not create_table(key):
             sys.exit(1)
-    elif args.action == 'get-tokens':
-        print_tokens(key)
-    elif args.action == 'insert-tokens':
-        insert_tokens(key, args.ip, args.manager_token, args.worker_token)
+    elif args.action == 'get-ip':
+        print_ip(key)
+    elif args.action == 'insert-ip':
+        insert_ip(key, args.ip)
     else:
         parser.print_usage()
 

azure/dockerfiles/files/init/entry.sh

@@ -28,32 +28,40 @@ get_node_id()
     echo "NODE: $NODE_ID"
 }
 
-get_tokens_db()
+get_tokens()
 {
-    echo "Get tokens from Azure Table"
-    DATA=$(python azuretokens.py get-tokens)
-    export MANAGER_IP=$(echo $DATA | cut -d'|' -f 1)
-    export MANAGER_TOKEN=$(echo $DATA | cut -d'|' -f 2)
-    export WORKER_TOKEN=$(echo $DATA | cut -d'|' -f 3)
-
-    echo "MANAGER_TOKEN=$MANAGER_TOKEN"
-    echo "WORKER_TOKEN=$WORKER_TOKEN"
+    echo "Get MANAGER IP from Azure Table"
+    export MANAGER_IP=$(python azureleader.py get-ip)
+    get_manager_token
+    get_worker_token
 }
 
-get_tokens_local()
+get_manager_token()
 {
-    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"
+    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
 }
 
 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
@@ -97,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
@@ -118,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-tokens $PRIVATE_IP $MANAGER_TOKEN $WORKER_TOKEN
+            # update azure table with the ip
+            python azureleader.py insert-ip $PRIVATE_IP
 
             echo "   Primary Manager init complete"
             # send identify message
@@ -177,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
@@ -187,14 +194,16 @@ 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
     echo " It's a Manager, run setup"
+    get_manager_token
     setup_manager
 else
     echo " It's a worker Node, run setup"
+    get_worker_token
     setup_worker
 fi
 

azure/release/files/custom-data_manager.sh

@@ -12,6 +12,8 @@ export SWARM_INFO_TABLE="variables('swarmInfoTable')"
 export SWARM_INFO_STORAGE_ACCOUNT="variables('swarmInfoStorageAccount')"
 export SWARM_LOGS_STORAGE_ACCOUNT="variables('swarmLogsStorageAccount')"
 export MANAGER_IP=$(ifconfig eth0 | grep "inet addr:" | cut -d: -f2 | cut -d" " -f1)
+export VMSS_MGR="dockerswarm-managervmss"
+export VMSS_WRK="dockerswarm-worker-vmss"
 # create daemon config with custom tag
 echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}/{{.ID}}\" }}" > /etc/docker/daemon.json
 service docker restart
@@ -20,9 +22,13 @@ sleep 5
 # add logging container
 docker volume create --name container-logs
 docker run --log-driver=json-file --name=editions_logger --restart=always -d -e ROLE="$ROLE" -e REGION="$REGION" -e TENANT_ID="$TENANT_ID" -e APP_ID="$APP_ID" -e APP_SECRET="$APP_SECRET" -e ACCOUNT_ID="$ACCOUNT_ID" -e GROUP_NAME="$GROUP_NAME" -e SWARM_LOGS_STORAGE_ACCOUNT="$SWARM_LOGS_STORAGE_ACCOUNT" -e SWARM_FILE_SHARE=`hostname` -p 514:514/udp -v container-logs:/log/ docker4x/logger-azure:"$DOCKER_FOR_IAAS_VERSION"
-
+# token server
+docker run --log-driver=json-file --name=meta-azure --restart=always -d -p $MANAGER_IP:9024:8080 -e APP_ID="$APP_ID" -e APP_SECRET="$APP_SECRET" -e SUBSCRIPTION_ID="$SUB_ID" -e TENANT_ID="$TENANT_ID" -e GROUP_NAME="$GROUP_NAME" -e VMSS_MGR="$VMSS_MGR" -e VMSS_WRK="$VMSS_WRK" -v /var/run/docker.sock:/var/run/docker.sock docker4x/meta-azure:$DOCKER_FOR_IAAS_VERSION metaserver -flavor=azure
+# init container
 docker run --log-driver=json-file  --restart=no -d -e ROLE="$ROLE" -e REGION="$REGION" -e TENANT_ID="$TENANT_ID" -e APP_ID="$APP_ID" -e APP_SECRET="$APP_SECRET" -e ACCOUNT_ID="$ACCOUNT_ID" -e GROUP_NAME="$GROUP_NAME" -e PRIVATE_IP="$MANAGER_IP" -e DOCKER_FOR_IAAS_VERSION="$DOCKER_FOR_IAAS_VERSION" -e SWARM_INFO_TABLE="$SWARM_INFO_TABLE" -e SWARM_INFO_STORAGE_ACCOUNT="$SWARM_INFO_STORAGE_ACCOUNT" -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /var/log:/var/log docker4x/init-azure:"$DOCKER_FOR_IAAS_VERSION"
+# guide container
 docker run --log-driver=json-file  --restart=always -d -e ROLE="$ROLE" -e REGION="$REGION" -e TENANT_ID="$TENANT_ID" -e APP_ID="$APP_ID" -e APP_SECRET="$APP_SECRET" -e ACCOUNT_ID="$ACCOUNT_ID" -e GROUP_NAME="$GROUP_NAME" -e PRIVATE_IP="$MANAGER_IP" -e DOCKER_FOR_IAAS_VERSION="$DOCKER_FOR_IAAS_VERSION" -e SWARM_INFO_TABLE="$SWARM_INFO_TABLE" -e SWARM_INFO_STORAGE_ACCOUNT="$SWARM_INFO_STORAGE_ACCOUNT" -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /var/log:/var/log docker4x/guide-azure:"$DOCKER_FOR_IAAS_VERSION"
 echo default: "$LB_NAME" >> /var/lib/docker/swarm/elb.config
 echo "$LB_NAME" > /var/lib/docker/swarm/lb_name
+# l4controller container
 docker run -d --log-driver=json-file  -v /var/run/docker.sock:/var/run/docker.sock  -v /var/lib/docker/swarm:/var/lib/docker/swarm --name=editions_controller docker4x/l4controller-azure:"$DOCKER_FOR_IAAS_VERSION" run --ad_app_id="$APP_ID" --ad_app_secret="$APP_SECRET" --subscription_id="$SUB_ID" --resource_group="$GROUP_NAME" --log=4 --default_lb_name="$LB_NAME" --environment=AzurePublicCloud

azure/release/files/custom-data_manager_cloud.sh

@@ -8,22 +8,38 @@ export LB_NAME="variables('lbName')"
 export APP_ID="variables('adServicePrincipalAppID')"
 export APP_SECRET="variables('adServicePrincipalAppSecret')"
 export TENANT_ID="variables('adServicePrincipalTenantID')"
-export CLOUD_USER="variables('dockerCloudUsername')"
-export CLOUD_KEY="variables('dockerCloudAPIKey')"
-export SWARM_NAME="variables('dockerCloudClusterName')"
 export SWARM_INFO_TABLE="variables('swarmInfoTable')"
 export SWARM_INFO_STORAGE_ACCOUNT="variables('swarmInfoStorageAccount')"
+export SWARM_LOGS_STORAGE_ACCOUNT="variables('swarmLogsStorageAccount')"
+export MANAGER_IP=$(ifconfig eth0 | grep "inet addr:" | cut -d: -f2 | cut -d" " -f1)
+export VMSS_MGR="dockerswarm-managervmss"
+export VMSS_WRK="dockerswarm-worker-vmss"
+# Cloud specific
+export SWARM_NAME="variables('dockerCloudClusterName')"
+export CLOUD_USER="variables('dockerCloudUsername')"
+export CLOUD_KEY="variables('dockerCloudAPIKey')"
 
+# create daemon config with custom tag
+echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}/{{.ID}}\" }}" > /etc/docker/daemon.json
+service docker restart
+sleep 5
+
 
+# add logging container
+docker volume create --name container-logs
+docker run --log-driver=json-file --name=editions_logger --restart=always -d -e ROLE="$ROLE" -e REGION="$REGION" -e TENANT_ID="$TENANT_ID" -e APP_ID="$APP_ID" -e APP_SECRET="$APP_SECRET" -e ACCOUNT_ID="$ACCOUNT_ID" -e GROUP_NAME="$GROUP_NAME" -e SWARM_LOGS_STORAGE_ACCOUNT="$SWARM_LOGS_STORAGE_ACCOUNT" -e SWARM_FILE_SHARE=`hostname` -p 514:514/udp -v container-logs:/log/ docker4x/logger-azure:"$DOCKER_FOR_IAAS_VERSION"
+# token server
+docker run --log-driver=json-file --name=meta-azure --restart=always -d -p $MANAGER_IP:9024:8080 -e APP_ID="$APP_ID" -e APP_SECRET="$APP_SECRET" -e SUBSCRIPTION_ID="$SUB_ID" -e TENANT_ID="$TENANT_ID" -e GROUP_NAME="$GROUP_NAME" -e VMSS_MGR="$VMSS_MGR" -e VMSS_WRK="$VMSS_WRK" -v /var/run/docker.sock:/var/run/docker.sock docker4x/meta-azure:$DOCKER_FOR_IAAS_VERSION metaserver -flavor=azure
+# init container
 docker run --restart=no -d -e ROLE="$ROLE" -e REGION="$REGION" -e TENANT_ID="$TENANT_ID" -e APP_ID="$APP_ID" -e APP_SECRET="$APP_SECRET" -e ACCOUNT_ID="$ACCOUNT_ID" -e PRIVATE_IP="$MANAGER_IP" -e DOCKER_FOR_IAAS_VERSION="$DOCKER_FOR_IAAS_VERSION" -e SWARM_INFO_TABLE="$SWARM_INFO_TABLE" -e SWARM_INFO_STORAGE_ACCOUNT="$SWARM_INFO_STORAGE_ACCOUNT" -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /var/log:/var/log docker4x/init-azure:"$DOCKER_FOR_IAAS_VERSION"
+# guide container
 docker run --restart=always -d -e ROLE="$ROLE -e REGION="$REGION -e ACCOUNT_ID="$ACCOUNT_ID" -e PRIVATE_IP="$MANAGER_IP" -e DOCKER_FOR_IAAS_VERSION="$DOCKER_FOR_IAAS_VERSION" -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker docker4x/guide-azure:"$DOCKER_FOR_IAAS_VERSION"
 echo default: "$LB_NAME" >> /var/lib/docker/swarm/elb.config
 echo "$LB_NAME" > /var/lib/docker/swarm/lb_name
+# l4controller container
 docker run -d -v /var/run/docker.sock:/var/run/docker.sock  -v /var/lib/docker/swarm:/var/lib/docker/swarm --name=editions_controller docker4x/l4controller-azure:"$DOCKER_FOR_IAAS_VERSION" run --ad_app_id="$APP_ID" --ad_app_secret="$APP_SECRET" --subscription_id="$SUB_ID" --resource_group="$GROUP_NAME" --log=4 --default_lb_name="$LB_NAME" --environment=AzurePublicCloud
-
-
-
+# cloud registration container
 export IS_LEADER=$(docker node inspect self -f "{{ .ManagerStatus.Leader }}") 
 if [ "$IS_LEADER" == "true" ]; then 
 docker run --rm --name=cloud_registration -v /var/run/docker.sock:/var/run/docker.sock -e DOCKER_USER="$CLOUD_USER" -e DOCKER_PASS="$CLOUD_KEY" -e SWARM_NAME="$SWARM_NAME" -e INTERNAL_ENDPOINT="$LB_SSH_IP:2376" docker4x/cloud-azure:$DOCKER_FOR_IAAS_VERSION
-fi
+fi