Fix Openhack Deployments (#306)

* remove duplicate login logic
* fix tenantId logic
* Remove labdeploy template

Author: dtzar

provision-team/setup.sh

@@ -141,7 +141,7 @@ echo "=========================================="
 echo "Username: $azureUserName"
 echo "Password: $azurePassword"
 
-if [[ -z "$tenantId" ]]; then
+if [[ "$tenantId" == "noSP" ]]; then
     echo "Command will be az login --username=$azureUserName --password=$azurePassword"
     az login --username=$azureUserName --password=$azurePassword
 else

provision-vm/Docker/startup.sh

@@ -26,13 +26,5 @@ echo 'export KVSTORE_DIR=/home/azureuser/team_env/kvstore' >> /home/azureuser/.b
 
 cd /home/azureuser/openhack-devops-proctor/provision-team
 
-# Running the provisioning of the team environment
-
-if [[ -z "$TENANTID" ]]; then
-    az login --username=$AZUREUSERNAME --password=$AZUREPASSWORD
-else
-    az login --service-principal --username=$AZUREUSERNAME --password=$AZUREPASSWORD --tenant=$TENANTID
-fi
-
 # Launching the team provisioning in background
 PATH=$PATH:/opt/mssql-tools/bin KVSTORE_DIR=/home/azureuser/team_env/kvstore ./setup.sh -i $SUBID -l $LOCATION -n $TEAMNAME -u "$AZUREUSERNAME" -p "$AZUREPASSWORD" -r "$RECIPIENTEMAIL" -c "$CHATCONNECTIONSTRING" -q "$CHATMESSAGEQUEUE" -t "$TENANTID" -a "$APPID" 2>&1 | tee -a /home/azureuser/logs/teamdeploy.out

provision-vm/azuredeploy.json

@@ -4,24 +4,28 @@
     "parameters": {
         "spUserName": {
             "type": "string",
+            "defaultValue": "",
             "metadata": {
                 "description": "Username for the service principal account."
             }
         },
         "spPassword": {
             "type": "string",
+            "defaultValue": "",
             "metadata": {
                 "description": "Password for the service principal account."
             }
         },
         "spTenant": {
             "type": "string",
+            "defaultValue": "noSP",
             "metadata": {
                 "description": "Tenant ID of the service principal account."
             }
         },
         "spAppId": {
             "type": "string",
+            "defaultValue": "",
             "metadata": {
                 "description": "Application ID of the service principal account."
             }