Added support for metaserver container

French Ben · French Ben · commit 15a7a7378f80 · 2016-11-21T13:32:55.000-08:00
Signed-off-by: French Ben &lt;frenchben@docker.com&gt;
diff --git a/azure/dockerfiles/files/guide/refresh.sh b/azure/dockerfiles/files/guide/refresh.sh
@@ -5,21 +5,37 @@ 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.
-    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)
-
-    MANAGER_TOKEN=$(docker swarm join-token manager -q)
-    WORKER_TOKEN=$(docker swarm join-token worker -q)
+    MYIP=$(ifconfig eth0 | grep "inet addr:" | cut -d: -f2 | cut -d" " -f1)
+    CURRENT_MANAGER_IP=$(python /usr/bin/azuretokens.py get-ip)
+    echo "Current manager IP = $CURRENT_MANAGER_IP ; my IP = $MYIP"
 
-    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/azuretokens.py insert-ip $MYIP
     fi
 
 fi
diff --git a/azure/dockerfiles/files/init/azuretokens.py b/azure/dockerfiles/files/init/azuretokens.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()
 
diff --git a/azure/dockerfiles/files/init/entry.sh b/azure/dockerfiles/files/init/entry.sh
@@ -30,14 +30,10 @@ get_node_id()
 
 get_tokens_db()
 {
-    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 azuretokens.py get-ip)
+    get_manager_token
+    get_worker_token
 }
 
 get_tokens_local()
@@ -48,6 +44,26 @@ get_tokens_local()
     echo "WORKER_TOKEN=$WORKER_TOKEN"
 }
 
+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
+}
+
 confirm_primary_ready()
 {
     n=0
@@ -132,7 +148,7 @@ setup_manager()
             get_node_id
 
             # update azure table with the tokens
-            python azuretokens.py insert-tokens $PRIVATE_IP $MANAGER_TOKEN $WORKER_TOKEN
+            python azuretokens.py insert-ip $PRIVATE_IP
 
             echo "   Primary Manager init complete"
             # send identify message
@@ -192,9 +208,11 @@ get_tokens_db
 # 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
 
diff --git a/azure/release/files/custom-data_manager.sh b/azure/release/files/custom-data_manager.sh
@@ -22,11 +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-aws:$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
-
-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-aws:$DOCKER_FOR_IAAS_VERSION metaserver -flavor=azure
diff --git a/azure/release/files/custom-data_manager_cloud.sh b/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-aws:$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
diff --git a/azure/release/files/custom-data_manager_ddc.sh b/azure/release/files/custom-data_manager_ddc.sh
@@ -8,13 +8,16 @@ export LB_NAME="variables('lbName')"
 export APP_ID="variables('adServicePrincipalAppID')"
 export APP_SECRET="variables('adServicePrincipalAppSecret')"
 export TENANT_ID="variables('adServicePrincipalTenantID')"
-export DDC_USER="variables('ddcUser')"
-export DDC_PASS="variables('ddcPass')"
-export RGROUP_NAME="variables('groupName')";
 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"
+# DDC Specific
+export DDC_USER="variables('ddcUser')"
+export DDC_PASS="variables('ddcPass')"
+
 # 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
@@ -23,13 +26,16 @@ 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-aws:$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"
+# guid 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
-
+# ddc init container
 docker run --log-driver=json-file --restart=no --rm -e ROLE=$ROLE -e REGION=$REGION -e ACCOUNT_ID=$ACCOUNT_ID -e APP_ID=$APP_ID -e APP_SECRET=$APP_SECRET -e TENANT_ID=$TENANT_ID -e RGROUP_NAME=$RGROUP_NAME -e UCP_ADMIN_USER=$DDC_USER -e UCP_ADMIN_PASSWORD=$DDC_PASS -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker docker4x/ddc-init-azure:$DOCKER_FOR_IAAS_VERSION
-
+# 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
 
diff --git a/azure/release/files/custom-data_worker.sh b/azure/release/files/custom-data_worker.sh
@@ -2,13 +2,17 @@ export ROLE="WORKER"
 export REGION="variables('storageLocation')"
 export ACCOUNT_ID="variables('accountID')"
 export DOCKER_FOR_IAAS_VERSION="variables('dockerForIAASVersion')"
+export REGION="variables('storageLocation')"
+export SUB_ID="variables('accountID')"
 export GROUP_NAME="variables('groupName')"
+export LB_NAME="variables('lbName')"
 export APP_ID="variables('adServicePrincipalAppID')"
 export APP_SECRET="variables('adServicePrincipalAppSecret')"
 export TENANT_ID="variables('adServicePrincipalTenantID')"
 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)
 
 # create daemon config with custom tag
 echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}/{{.ID}}\" }}" > /etc/docker/daemon.json
@@ -18,6 +22,7 @@ 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"
-
+# 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 GROUP_NAME="$GROUP_NAME" -e SWARM_INFO_TABLE="$SWARM_INFO_TABLE" -e SWARM_INFO_STORAGE_ACCOUNT="$SWARM_INFO_STORAGE_ACCOUNT" -e ACCOUNT_ID=$ACCOUNT_ID -e MANAGER_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 -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 ACCOUNT_ID=$ACCOUNT_ID -e MANAGER_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
diff --git a/azure/release/files/custom-data_worker_ddc.sh b/azure/release/files/custom-data_worker_ddc.sh
