Updated DDC custom template

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

Author: French Ben

azure/dockerfiles/files/ddc-init/entry.sh

@@ -14,8 +14,6 @@ echo "REGION=$REGION"
 echo "RGROUP_NAME=$RGROUP_NAME"
 echo "APP_ID=$APP_ID"
 echo "TENANT_ID=$TENANT_ID"
-echo "LB_NAME=$LB_NAME"
-echo "LB_IP=$LB_IP"
 echo "UCP_ADMIN_USER=$UCP_ADMIN_USER"
 echo "UCP_IMAGE=${HUB_NAMESPACE}/ucp:${HUB_TAG}"
 echo "#================"

azure/release/files/custom-data_manager_ddc.sh

@@ -8,12 +8,9 @@ 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 LB_NAME="variables('lbPublicIPAddressName')"; 
-export LB_IP="variables('lbPublicIPAddress')";
+export RGROUP_NAME="variables('groupName')";
 
 
 
@@ -24,5 +21,5 @@ echo "$LB_NAME" > /var/lib/docker/swarm/lb_name
 docker run -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 --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 -e LB_NAME=$LB_NAME -e LB_IP=$LB_SSH_IP -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker docker4x/ddc-init-azure:$DOCKER_FOR_IAAS_VERSION
+docker run --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
 

azure/release/files/custom-data_worker_ddc.sh

@@ -21,4 +21,4 @@ docker run --log-driver=json-file --name=editions_logger --restart=always -d -e
 
 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
 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
-docker run --restart=no --rm -e ROLE=$ROLE -e REGION=$REGION -e ACCOUNT_ID=$ACCOUNT_ID -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker docker4x/ddc-init:dev
+docker run --restart=no --rm -e ROLE=$ROLE -e REGION=$REGION -e ACCOUNT_ID=$ACCOUNT_ID -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker docker4x/ddc-init-azure:$DOCKER_FOR_IAAS_VERSION

azure/release/files/release.py

@@ -51,8 +51,8 @@ def main():
     flat_edition_version = edition_version.replace(" ", "")
     vhd_sku = args.vhd_sku
     vhd_version = args.vhd_version
-    cs_vhd_sku = args.vhd_sku
-    cs_vhd_version = args.vhd_version
+    cs_vhd_sku = args.cs_vhd_sku
+    cs_vhd_version = args.cs_vhd_version
 
     docker_for_azure_version = u"azure-v{}".format(flat_edition_version)
     image_name = u"Moby Linux {}".format(docker_for_azure_version)

azure/release/files/utils.py

@@ -167,26 +167,6 @@ def create_rg_cloud_template(release_channel, docker_version,
         }
         outputs.update(new_outputs)
 
-    # inbound = data.get('inbound')
-    # if inbound:
-    #     for key, val in enumerate(data.get('resources')):
-    #         if val['name'] == "[variables('lbSSHName')]":
-    #             inbound = val['properties']['inboundNatRules']
-    #             new_inbound = {
-    #                 "name": "cloud",
-    #                 "properties": {
-    #                     "frontendIPConfiguration": {
-    #                         "id": "[concat(resourceId('Microsoft.Network/loadBalancers',variables('lbSSHName')),'/frontendIPConfigurations/default')]"
-    #                     },
-    #                     "protocol": "tcp",
-    #                     "frontendPort": 2376,
-    #                     "backendPort": 2376,
-    #                     "enableFloatingIP": False
-    #                 }
-    #             }
-    #             inbound.append(new_inbound)
-    #             break
-    
     outdir = u"dist/azure/{}".format(release_channel)
     # if the directory doesn't exist, create it.
     if not os.path.exists(outdir):