support encryption in transit for azure file share

Signed-off-by: Jianguo Ma <[email protected]>

Author: majguo

src/main/arm/mainTemplate.json

@@ -265,10 +265,7 @@
             "sku": {
                 "name": "Standard_LRS"
             },
-            "kind": "Storage",
-            "properties": {
-                "supportsHttpsTrafficOnly": false
-            }
+            "kind": "Storage"
         },
         {
             "condition": "[parameters('configureIHS')]",

src/main/scripts/configure-ihs-on-dmgr.sh

@@ -36,9 +36,9 @@ mkdir /etc/smbcredentials
 echo "username=$storageAccountName" > /etc/smbcredentials/${storageAccountName}.cred
 echo "password=$storageAccountKey" >> /etc/smbcredentials/${storageAccountName}.cred
 chmod 600 /etc/smbcredentials/${storageAccountName}.cred
-echo "//${storageAccountName}.file.core.windows.net/${fileShareName} $mountpointPath cifs nofail,vers=2.1,credentials=/etc/smbcredentials/${storageAccountName}.cred,dir_mode=0777,file_mode=0777,serverino" >> /etc/fstab
+echo "//${storageAccountName}.file.core.windows.net/${fileShareName} $mountpointPath cifs nofail,credentials=/etc/smbcredentials/${storageAccountName}.cred,dir_mode=0777,file_mode=0777,serverino" >> /etc/fstab
 
-mount -t cifs //${storageAccountName}.file.core.windows.net/${fileShareName} $mountpointPath -o vers=2.1,credentials=/etc/smbcredentials/${storageAccountName}.cred,dir_mode=0777,file_mode=0777,serverino
+mount -t cifs //${storageAccountName}.file.core.windows.net/${fileShareName} $mountpointPath -o credentials=/etc/smbcredentials/${storageAccountName}.cred,dir_mode=0777,file_mode=0777,serverino
 if [[ $? != 0 ]]; then
   echo "Failed to mount //${storageAccountName}.file.core.windows.net/${fileShareName} $mountpointPath"
   exit 1

src/main/scripts/configure-ihs.sh

@@ -134,9 +134,9 @@ mkdir /etc/smbcredentials
 echo "username=$storageAccountName" > /etc/smbcredentials/${storageAccountName}.cred
 echo "password=$storageAccountKey" >> /etc/smbcredentials/${storageAccountName}.cred
 chmod 600 /etc/smbcredentials/${storageAccountName}.cred
-echo "//${storageAccountName}.file.core.windows.net/${fileShareName} $mountpointPath cifs nofail,vers=2.1,credentials=/etc/smbcredentials/${storageAccountName}.cred,dir_mode=0777,file_mode=0777,serverino" >> /etc/fstab
+echo "//${storageAccountName}.file.core.windows.net/${fileShareName} $mountpointPath cifs nofail,credentials=/etc/smbcredentials/${storageAccountName}.cred,dir_mode=0777,file_mode=0777,serverino" >> /etc/fstab
 
-mount -t cifs //${storageAccountName}.file.core.windows.net/${fileShareName} $mountpointPath -o vers=2.1,credentials=/etc/smbcredentials/${storageAccountName}.cred,dir_mode=0777,file_mode=0777,serverino
+mount -t cifs //${storageAccountName}.file.core.windows.net/${fileShareName} $mountpointPath -o credentials=/etc/smbcredentials/${storageAccountName}.cred,dir_mode=0777,file_mode=0777,serverino
 if [[ $? != 0 ]]; then
   echo "Failed to mount //${storageAccountName}.file.core.windows.net/${fileShareName} $mountpointPath"
   exit 1