Skip to content

Commit 616beb3

Browse files
authored
Merge pull request #311078 from mamccrea/revert-310560-tiger-team-low
Revert "Files Tiger Team updates"
2 parents ec06254 + 38a2659 commit 616beb3

2 files changed

Lines changed: 12 additions & 31 deletions

File tree

articles/storage/files/storage-files-configure-s2s-vpn.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ If you don't have an existing network appliance, Windows Server contains a built
4444

4545
## Add virtual network to storage account
4646

47-
You need an existing Azure storage account with an Azure file share, and a virtual network in the same region as the storage account with a subnet named `GatewaySubnet` (required for the virtual network gateway deployment in the next step).
48-
4947
To add a new or existing virtual network to your storage account, follow these steps.
5048

5149
# [Portal](#tab/azure-portal)
@@ -227,8 +225,6 @@ To add a new or existing virtual network to your storage account, follow these s
227225

228226
## Deploy a virtual network gateway
229227

230-
You need a virtual network with a subnet named `GatewaySubnet` in the same region and subscription as your storage account, a public IP address resource (or you'll create one), and you must choose a gateway SKU (avoid Basic SKU if using IKEv2/route-based VPN); optionally, BGP configuration may apply if your organization requires it.
231-
232228
To deploy a virtual network gateway, follow these steps.
233229

234230
# [Portal](#tab/azure-portal)
@@ -322,8 +318,6 @@ To deploy a virtual network gateway, follow these steps.
322318

323319
### Create a local network gateway for your on-premises gateway
324320

325-
You need the public IP address of your on-premises VPN device, the on-premises network address ranges (for example, 192.168.0.0/16), and optionally BGP peer IP address information if BGP is required; the local network gateway should be created in the same Azure region as your virtual network gateway.
326-
327321
A local network gateway is an Azure resource that represents your on-premises network appliance. It's deployed alongside your storage account, virtual network, and virtual network gateway, but doesn't need to be in the same resource group or subscription as the storage account. To create a local network gateway, follow these steps.
328322

329323
# [Portal](#tab/azure-portal)
@@ -370,8 +364,6 @@ az network local-gateway create --gateway-ip-address 5.4.3.2 --name MyLocalGatew
370364

371365
## Configure on-premises network appliance
372366

373-
You need a compatible on-premises VPN device (see [list of tested devices](../../vpn-gateway/vpn-gateway-about-vpn-devices.md)), the public IP address of your Azure virtual network gateway, and a shared key (PSK) for establishing the VPN connection.
374-
375367
The specific steps to configure your on-premises network appliance depend on the network appliance your organization has selected.
376368

377369
When configuring your network appliance, you'll need the following items:
@@ -387,8 +379,6 @@ When configuring your network appliance, you'll need the following items:
387379

388380
## Create the site-to-site connection
389381

390-
You need an existing Azure virtual network gateway, a local network gateway resource representing your on-premises VPN device, and a shared key (PSK) that matches the key configured on your on-premises VPN device; optionally, choose IKEv1 for policy-based VPN or IKEv2 for route-based VPN depending on your device.
391-
392382
To complete the deployment of a S2S VPN, you must create a connection between your on-premises network appliance (represented by the local network gateway resource) and the Azure virtual network gateway. To do this, follow these steps.
393383

394384
# [Portal](#tab/azure-portal)
@@ -481,8 +471,6 @@ az network vpn-connection show --name VNet1toSite1 --resource-group <resource-gr
481471

482472
## Mount Azure file share
483473

484-
You need an established site-to-site VPN connection between your on-premises network and Azure, an Azure file share in a storage account configured for virtual network access, and appropriate client credentials; OS-specific commands apply for Windows, macOS, Linux (NFS), or Linux (SMB).
485-
486474
The final step in configuring a S2S VPN is verifying that it works for Azure Files. You can do this by mounting your Azure file share on-premises. See the instructions to mount by OS here:
487475

488476
- [Windows](storage-how-to-use-files-windows.md)

articles/storage/files/windows-server-to-azure-files.md

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ Most customers take one of two deployment approaches:
2121
## Applies to
2222
| Management model | Billing model | Media tier | Redundancy | SMB | NFS |
2323
|-|-|-|-|:-:|:-:|
24-
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Local (LRS) | Yes | No |
25-
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Zone (ZRS) | Yes | No |
26-
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Geo (GRS) | Yes | No |
27-
| Microsoft.Storage | Provisioned v2 | HDD (standard) | GeoZone (GZRS) | Yes | No |
28-
| Microsoft.Storage | Provisioned v1 | SSD (premium) | Local (LRS) | Yes | No |
29-
| Microsoft.Storage | Provisioned v1 | SSD (premium) | Zone (ZRS) | Yes | No |
30-
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Local (LRS) | Yes | No |
31-
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Zone (ZRS) | Yes | No |
32-
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Geo (GRS) | Yes | No |
33-
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | GeoZone (GZRS) | Yes | No |
24+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
25+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
26+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | Geo (GRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
27+
| Microsoft.Storage | Provisioned v2 | HDD (standard) | GeoZone (GZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
28+
| Microsoft.Storage | Provisioned v1 | SSD (premium) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
29+
| Microsoft.Storage | Provisioned v1 | SSD (premium) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
30+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Local (LRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
31+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Zone (ZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
32+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | Geo (GRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
33+
| Microsoft.Storage | Pay-as-you-go | HDD (standard) | GeoZone (GZRS) | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
34+
3435

3536
## Reduce TCO with cloud file shares
3637

@@ -68,15 +69,7 @@ Azure Files is built for hybrid access and offers flexible deployment options, i
6869

6970
:::image type="content" source="media/windows-server-to-azure-files/azure-files-network-access.png" alt-text="Screenshot showing various access options for Azure file shares." lightbox="media/windows-server-to-azure-files/azure-files-network-access.png":::
7071

71-
Moving data from Windows file servers to Azure Files is easy, and you can do it in the background without interrupting user access. Just install Azure File Sync on your file server, connect to an Azure file share, and start the synchronization.
72-
73-
**Prerequisites:**
74-
- An active Azure subscription
75-
- An Azure storage account with an Azure file share
76-
- Network connectivity between the server and Azure (internet, VPN, or ExpressRoute)
77-
- A supported Windows Server with the Azure File Sync agent installed
78-
79-
**Verify:** Confirm the Azure file share is mounted and the Azure File Sync agent reports a **Healthy** status.
72+
Moving data from Windows file servers to Azure Files is easy, and you can do it in the background without interrupting user access. Just install Azure File Sync on your file server, connect to an Azure file share, and start the synchronization.
8073

8174
When you migrate to Azure Files, none of your file path links need to break. You can [use DFS Namespaces](files-manage-namespaces.md) and redirect users to Azure Files. If you're extending an existing Windows file server to Azure using Azure File Sync, users continue to access their files using the same file paths.
8275

0 commit comments

Comments
 (0)