Skip to content

Commit af7a7ec

Browse files
Court72Court72
authored
Merge pull request #107938 from lanicolas/patch-24
 Aligning with Bash style guide
2 parents 9558b17 + 2f31182 commit af7a7ec

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

‎articles/lab-services/how-to-attach-external-storage.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,26 @@ For file share with a public endpoint:
6565
#!/bin/bash
6666

6767
# Assign variables values for your storage account and file share
68-
storage_account_name=""
69-
storage_account_key=""
70-
fileshare_name=""
68+
STORAGE_ACCOUNT_NAME=""
69+
STORAGE_ACCOUNT_KEY=""
70+
FILESHARE_NAME=""
7171

7272
# Do not use 'mnt' for mount directory.
7373
# Using ‘mnt’ will cause issues on student VMs.
74-
mount_directory="prm-mnt"
74+
MOUNT_DIRECTORY="prm-mnt"
7575

76-
sudo mkdir /$mount_directory/$fileshare_name
76+
sudo mkdir /$MOUNT_DIRECTORY/$FILESHARE_NAME
7777
if [ ! -d "/etc/smbcredentials" ]; then
7878
sudo mkdir /etc/smbcredentials
7979
fi
80-
if [ ! -f "/etc/smbcredentials/$storage_account_name.cred" ]; then
81-
sudo bash -c "echo ""username=$storage_account_name"" >> /etc/smbcredentials/$storage_account_name.cred"
82-
sudo bash -c "echo ""password=$storage_account_key"" >> /etc/smbcredentials/$storage_account_name.cred"
80+
if [ ! -f "/etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred" ]; then
81+
sudo bash -c "echo ""username=$STORAGE_ACCOUNT_NAME"" >> /etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred"
82+
sudo bash -c "echo ""password=$STORAGE_ACCOUNT_KEY"" >> /etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred"
8383
fi
84-
sudo chmod 600 /etc/smbcredentials/$storage_account_name.cred
84+
sudo chmod 600 /etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred
8585

86-
sudo bash -c "echo ""//$storage_account_name.file.core.windows.net/$fileshare_name /$mount_directory/$fileshare_name cifs nofail,vers=3.0,credentials=/etc/smbcredentials/$storage_account_name.cred,dir_mode=0777,file_mode=0777,serverino"" >> /etc/fstab"
87-
sudo mount -t cifs //$storage_account_name.file.core.windows.net/$fileshare_name /$mount_directory/$fileshare_name -o vers=3.0,credentials=/etc/smbcredentials/$storage_account_name.cred,dir_mode=0777,file_mode=0777,serverino
86+
sudo bash -c "echo ""//$STORAGE_ACCOUNT_NAME.file.core.windows.net/$FILESHARE_NAME /$MOUNT_DIRECTORY/$FILESHARE_NAME cifs nofail,vers=3.0,credentials=/etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred,dir_mode=0777,file_mode=0777,serverino"" >> /etc/fstab"
87+
sudo mount -t cifs //$STORAGE_ACCOUNT_NAME.file.core.windows.net/$FILESHARE_NAME /$MOUNT_DIRECTORY/$FILESHARE_NAME -o vers=3.0,credentials=/etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred,dir_mode=0777,file_mode=0777,serverino
8888
```
8989

9090
For file share with a private endpoint:
@@ -93,27 +93,27 @@ For file share with a private endpoint:
9393
#!/bin/bash
9494

9595
# Assign variables values for your storage account and file share
96-
storage_account_name=""
97-
storage_account_ip=""
98-
storage_account_key=""
99-
fileshare_name=""
96+
STORAGE_ACCOUNT_NAME=""
97+
STORAGE_ACCOUNT_IP=""
98+
STORAGE_ACCOUNT_KEY=""
99+
FILESHARE_NAME=""
100100

101101
# Do not use 'mnt' for mount directory.
102102
# Using ‘mnt’ will cause issues on student VMs.
103-
mount_directory="prm-mnt"
103+
MOUNT_DIRECTORY="prm-mnt"
104104

105-
sudo mkdir /$mount_directory/$fileshare_name
105+
sudo mkdir /$MOUNT_DIRECTORY/$FILESHARE_NAME
106106
if [ ! -d "/etc/smbcredentials" ]; then
107107
sudo mkdir /etc/smbcredentials
108108
fi
109-
if [ ! -f "/etc/smbcredentials/$storage_account_name.cred" ]; then
110-
sudo bash -c "echo ""username=$storage_account_name"" >> /etc/smbcredentials/$storage_account_name.cred"
111-
sudo bash -c "echo ""password=$storage_account_key"" >> /etc/smbcredentials/$storage_account_name.cred"
109+
if [ ! -f "/etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred" ]; then
110+
sudo bash -c "echo ""username=$STORAGE_ACCOUNT_NAME"" >> /etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred"
111+
sudo bash -c "echo ""password=$STORAGE_ACCOUNT_KEY"" >> /etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred"
112112
fi
113113
sudo chmod 600 /etc/smbcredentials/$storage_account_name.cred
114114

115-
sudo bash -c "echo ""//$storage_account_ip/$fileshare_name /$mount_directory/$fileshare_name cifs nofail,vers=3.0,credentials=/etc/smbcredentials/$storage_account_name.cred,dir_mode=0777,file_mode=0777,serverino"" >> /etc/fstab"
116-
sudo mount -t cifs //$storage_account_name.file.core.windows.net/$fileshare_name /$mount_directory/$fileshare_name -o vers=3.0,credentials=/etc/smbcredentials/$storage_account_name.cred,dir_mode=0777,file_mode=0777,serverino
115+
sudo bash -c "echo ""//$STORAGE_ACCOUNT_IP/$FILESHARE_NAME /$MOUNT_DIRECTORY/$fileshare_name cifs nofail,vers=3.0,credentials=/etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred,dir_mode=0777,file_mode=0777,serverino"" >> /etc/fstab"
116+
sudo mount -t cifs //$STORAGE_ACCOUNT_NAME.file.core.windows.net/$FILESHARE_NAME /$MOUNT_DIRECTORY/$FILESHARE_NAME -o vers=3.0,credentials=/etc/smbcredentials/$STORAGE_ACCOUNT_NAME.cred,dir_mode=0777,file_mode=0777,serverino
117117
```
118118

119119
If the template VM that mounts the Azure Files share to the `/mnt` directory is already published, the student can either:
@@ -211,18 +211,18 @@ To use an Azure NetApp Files share in Azure Lab Services:
211211
exit 1
212212
fi
213213
214-
volume_name=$1
215-
capacity_pool_ipaddress=0.0.0.0 # IP address of capacity pool
214+
VOLUME_NAME=$1
215+
CAPACITY_POOL_IP_ADDR=0.0.0.0 # IP address of capacity pool
216216
217217
# Do not use 'mnt' for mount directory.
218218
# Using ‘mnt’ might cause issues on student VMs.
219-
mount_directory="prm-mnt"
219+
MOUNT_DIRECTORY="prm-mnt"
220220
221-
sudo mkdir -p /$mount_directory
222-
sudo mkdir /$mount_directory/$folder_name
221+
sudo mkdir -p /$MOUNT_DIRECTORY
222+
sudo mkdir /$MOUNT_DIRECTORY/$FOLDER_NAME
223223
224-
sudo mount -t nfs -o rw,hard,rsize=65536,wsize=65536,vers=3,tcp $capacity_pool_ipaddress:/$volume_name /$mount_directory/$volume_name
225-
sudo bash -c "echo ""$capacity_pool_ipaddress:/$volume_name /$mount_directory/$volume_name nfs bg,rw,hard,noatime,nolock,rsize=65536,wsize=65536,vers=3,tcp,_netdev 0 0"" >> /etc/fstab"
224+
sudo mount -t nfs -o rw,hard,rsize=65536,wsize=65536,vers=3,tcp $CAPACITY_POOL_IP_ADDR:/$VOLUME_NAME /$MOUNT_DIRECTORY/$VOLUME_NAME
225+
sudo bash -c "echo ""$CAPACITY_POOL_IP_ADDR:/$VOLUME_NAME /$MOUNT_DIRECTORY/$VOLUME_NAME nfs bg,rw,hard,noatime,nolock,rsize=65536,wsize=65536,vers=3,tcp,_netdev 0 0"" >> /etc/fstab"
226226
```
227227

228228
6. If all students are sharing access to the same Azure NetApp Files volume, you can run the `mount_fileshare.sh` script on the template machine before publishing. If students each get their own volume, save the script to be run later by the student.

0 commit comments

Comments
 (0)