diff --git a/windows/deployment/do/mcc-ent-configure-provision-linux.md b/windows/deployment/do/mcc-ent-configure-provision-linux.md
deleted file mode 100644
index 3c39a7af8f..0000000000
--- a/windows/deployment/do/mcc-ent-configure-provision-linux.md
+++ /dev/null
@@ -1,149 +0,0 @@
----
-title: MCC for Enterprise provision Linux cache node
-description: Microsoft Connected Cache for Enterprise. Learn about how to provision Linux cache node.
-ms.service: windows-client
-ms.subservice: itpro-updates
-ms.topic: how-to
-manager: aaroncz
-ms.author: nidos
-author: doshnid
-ms.reviewer: mstewart
-ms.collection: tier3
-appliesto:
-- ✅ Windows 11
-- ✅ Windows 10
-- ✅ Microsoft Connected Cache for Enterprise
-ms.date: 06/03/2024
----
-
-
-
-
-
-# " * "
-TODO: Add your heading
-
-
-
-TODO: Add your introductory paragraph
-
-
-
-
-
-## Prerequisites
-
-TODO: List the prerequisites
-
-
-
-## "\ * \"
-TODO: Add introduction sentence(s)
-[Include a sentence or two to explain only what is needed to complete the procedure.]
-TODO: Add ordered list of procedure steps
-1. Step 1
-1. Step 2
-1. Step 3
-
-## "\ * \"
-TODO: Add introduction sentence(s)
-[Include a sentence or two to explain only what is needed to complete the procedure.]
-TODO: Add ordered list of procedure steps
-1. Step 1
-1. Step 2
-1. Step 3
-
-## "\ * \"
-TODO: Add introduction sentence(s)
-[Include a sentence or two to explain only what is needed to complete the procedure.]
-TODO: Add ordered list of procedure steps
-1. Step 1
-1. Step 2
-1. Step 3
-
-
-
-## Next step
-
-TODO: Add your next step link(s)
-
-> [!div class="nextstepaction"]
-> [Write concepts](article-concept.md)
-
-
-
-## Related content
-
-TODO: Add your next step link(s)
-
-- [Write concepts](article-concept.md)
-
-
-
diff --git a/windows/deployment/do/mcc-ent-configure-provision-windows.md b/windows/deployment/do/mcc-ent-configure-provision-windows.md
deleted file mode 100644
index d2ea4921a2..0000000000
--- a/windows/deployment/do/mcc-ent-configure-provision-windows.md
+++ /dev/null
@@ -1,149 +0,0 @@
----
-title: MCC for Enterprise provision Windows cache node
-description: Microsoft Connected Cache for Enterprise. Learn about how to provision Windows cache node.
-ms.service: windows-client
-ms.subservice: itpro-updates
-ms.topic: how-to
-manager: aaroncz
-ms.author: nidos
-author: doshnid
-ms.reviewer: mstewart
-ms.collection: tier3
-appliesto:
-- ✅ Windows 11
-- ✅ Windows 10
-- ✅ Microsoft Connected Cache for Enterprise
-ms.date: 06/03/2024
----
-
-
-
-
-
-# " * "
-TODO: Add your heading
-
-
-
-TODO: Add your introductory paragraph
-
-
-
-
-
-## Prerequisites
-
-TODO: List the prerequisites
-
-
-
-## "\ * \"
-TODO: Add introduction sentence(s)
-[Include a sentence or two to explain only what is needed to complete the procedure.]
-TODO: Add ordered list of procedure steps
-1. Step 1
-1. Step 2
-1. Step 3
-
-## "\ * \"
-TODO: Add introduction sentence(s)
-[Include a sentence or two to explain only what is needed to complete the procedure.]
-TODO: Add ordered list of procedure steps
-1. Step 1
-1. Step 2
-1. Step 3
-
-## "\ * \"
-TODO: Add introduction sentence(s)
-[Include a sentence or two to explain only what is needed to complete the procedure.]
-TODO: Add ordered list of procedure steps
-1. Step 1
-1. Step 2
-1. Step 3
-
-
-
-## Next step
-
-TODO: Add your next step link(s)
-
-> [!div class="nextstepaction"]
-> [Write concepts](article-concept.md)
-
-
-
-## Related content
-
-TODO: Add your next step link(s)
-
-- [Write concepts](article-concept.md)
-
-
-
diff --git a/windows/deployment/do/mcc-ent-create-resource-and-cache.md b/windows/deployment/do/mcc-ent-create-resource-and-cache.md
index c1584f8b3d..3e23477196 100644
--- a/windows/deployment/do/mcc-ent-create-resource-and-cache.md
+++ b/windows/deployment/do/mcc-ent-create-resource-and-cache.md
@@ -21,7 +21,7 @@ This article outlines how to create and configure your Microsoft Connected Cache
## Prerequisites
1. **Azure Pay-As-You-Go subscription**: Microsoft Connected Cache is a free-of-charge service hosted in Azure. You'll need a pay-as-you-go Azure subscription in order to onboard to our service. To create a subscription, go to [pay-as-you-go subscription page](https://azure.microsoft.com/offers/ms-azr-0003p/).
2. **Hardware to host MCC**: The recommended configuration serves approximately 35,000 managed devices, downloading a 2-GB payload in 24-hour timeframe at a sustained rate of 6.5 Gbps.
-For more information on sizing and OS requirements, see [the prerequisites for using MCCE](mcc-ent-prerequisites.md).
+For more information on sizing and OS requirements, see [the prerequisites for using MCC for Enterprise and Education](mcc-ent-prerequisites.md).
## Create MCC Azure resource
@@ -60,6 +60,7 @@ For more information on sizing and OS requirements, see [the prerequisites for u
* Resource group under which an MCC resource can be created. Use the [az group create](/cli/azure/group#az-group-create) command to create a new Resource group if you don't already have one.
#### Create MCC Azure resource
+
Replace the following placeholders with your own information:
* *\*: An existing resource group in your subscription.
* *\*: A name for your Microsoft Connected Cache for Enterprise resource.
@@ -85,7 +86,8 @@ az mcc ent resource create --mcc-resource-name --resource-group
:::image type="content" source="images/mcc-isp-provision-cache-node-numbered.png" alt-text="Screenshot of the Azure portal depicting the cache node configuration page of a cache node. This screenshot shows all of the fields you can choose to configure the cache node." lightbox="./images/mcc-isp-provision-cache-node-numbered.png":::
-->
The creation of cache node might take a few minutes. Select Refresh to see your recently created cache node.
-Once the status changes to **Not Configured**, you can now configure your cache node.
+Once the cache node state changes to **Not Configured**, you can now configure your cache node.
+To know more about different cache node state, see [Cache node states](#cache-node-states).
# [Azure CLI](#tab/cli)
@@ -112,10 +114,7 @@ az mcc ent node create --cache-node-name --mcc-resource-name ```
>In the output look for cacheNodeState. If ***cacheNodeState = Not Configured***, you can continue with cache node configuration.
>If ***cacheNodeState = Registration in Progress***, then the cache node is still in process of being created. Please wait for a minute or two more and run the command again.
-
-
-
+>To know more about different cache node state, see [Cache node states](#cache-node-states).
---
@@ -200,7 +199,7 @@ To deploy the cache node to a **Windows** host machine, see [Deploy cache node t
To deploy the cache node to a **Linux** host machine, see [Deploy cache node to Linux](mcc-ent-deploy-to-linux.md)
### [Azure CLI](#tab/cli/)
-To deploy cache nodes using Azure CLI, see [Bulk management of cache nodes](mcc-ent-manage-cache-using-CLI.md)
+To deploy cache nodes using Azure CLI, see [Manage cache nodes using CLI](mcc-ent-manage-cache-using-CLI.md)
---
@@ -247,3 +246,16 @@ You can choose to enable or disable proxy settings on your cache node.
|---|---|---|
|**Proxy host name**| String or number| Proxy host name or address|
|**Proxy port**| Integer| Proxy port
+
+
+
+##### Cache node states
+| Cache node state |Description|
+|---|---|
+|Creation in progress| Cache node is being created|
+|Registration in progress| Cache node is being registered|
+|Not configured| Cache node is ready to be configured|
+|Not provisioned| Cache node is ready to be provisioned on host machine|
+|Healthy| Cache node phoning home|
+|Unhealthy| Cache node has stopped phoning home|
+|Never phoned home| Cache node has provisioned but has never phoned home|
\ No newline at end of file
diff --git a/windows/deployment/do/mcc-ent-manage-cache-using-CLI.md b/windows/deployment/do/mcc-ent-manage-cache-using-CLI.md
index 1f28f0bdbf..36acc712de 100644
--- a/windows/deployment/do/mcc-ent-manage-cache-using-CLI.md
+++ b/windows/deployment/do/mcc-ent-manage-cache-using-CLI.md
@@ -20,7 +20,7 @@ ms.date: 06/03/2024
-This article outlines how to create, configure, and deploy Microsoft Connected Cache for Enterprise (MCCE) cache nodes using Azure CLI.
+This article outlines how to create, configure, and deploy Microsoft Connected Cache for Enterprise (MCC) cache nodes using Azure CLI.
## Prerequisites:
@@ -44,10 +44,10 @@ az group create --name myrg --location westus
Once the resource group is created, you'll need to create a Microsoft Connected Cache for Enterprise resource.
-### 2. Create an MCCE Azure resource
-An MCCE Azure resource is a top-level Azure resource under which cache nodes can be created.
+### 2. Create an Azure resource
+An MCC Azure resource is a top-level Azure resource under which cache nodes can be created.
-To create an MCCE Azure resource, use `az mcc ent resource create`
+To create an MCC Azure resource, use `az mcc ent resource create`
```azurecli-interactive
az mcc ent resource create --mcc-resource-name mymccresource --resource-group myrg
@@ -108,19 +108,9 @@ az mcc ent node update --cache-node-name --mcc-resource-name [!Note]
->For a cache node that is to be deployed on Windows host OS, the physical path of the cache drive must be **/var/mcc**.
-
-
->[!NOTE]
->Proxy info changes, required to provision cache node.
-
-
->[!IMPORTANT]
->In the output, look for operationStatus. **operationStatus = Succeeded** indicates that our services have successfully updated the cache node.
-
-
->[!IMPORTANT]
->Please save values for physicalPath, sizeInGb, proxyPort, proxyHostName as these values will be needed to create the provisioning script.
+>* For a cache node that is to be deployed on Windows host OS, the physical path of the cache drive must be **/var/mcc**.
+>* In the output, look for operationStatus. **operationStatus = Succeeded** indicates that our services have successfully updated the cache node. You will also see that cacheNodeState will show "Not Provisioned".
+>* Please save values for physicalPath, sizeInGb, proxyPort, proxyHostName as these values will be needed to construct the provisioning script.
@@ -136,71 +126,35 @@ az mcc ent node get-provisioning-details --cache-node-name mycachenode --mcc-res
Save the resulting values for cacheNodeId, customerKey, mccResourceId, registrationKey. These GUIDs are needed to create the provisioning script.
-### 7. Deploy cache node
+### 7. Deploy cache node
+
+
#### Deploy cache node to Linux host machine
Before you deploy your cache node to a Linux host machine, make sure you have met the prerequisites listed here: [Host machine requirements](mcc-ent-prerequisites.md)
Use the following link to download and extract the Linux-compatible MCCE provisioning package onto the host machine.
-[Download MCCE provisioning package for Linux host machine](https://aka.ms/MCC-Ent-InstallScript-Linux)
+[Download MCC provisioning package for Linux host machine](https://aka.ms/MCC-Ent-InstallScript-Linux)
->[!IMPORTANT]
->Before you execute the provisioning command, make sure you change directory to the extracted provisioning package and set the script execution permissions by running the command below.
-```azurepowershell-interactive
-sudo chmod +x provisionmcc.sh
-```
-
-Replace the values in the following provisioning command before running it.
-
-```azurepowershell-interactive
-sudo ./provisionmcc.sh customerid="enter mccResourceId here" cachenodeid=" enter cacheNodeId here " customerkey=" enter customerKey here " registrationkey="enter registrationKey here" drivepathandsizeingb="enter physicalPath value,enter sizeInGb value here" shoulduseproxy="true" proxyurl=http://enter proxy hostname:enter port
-```
+To deploy the cache node to a **Linux** host machine, see [Deploy cache node to Linux](mcc-ent-deploy-to-linux.md)
->[!IMPORTANT]
->'shoulduseproxy' parameter is required, whether or not your network uses proxy to access internet.
-
#### Deploy cache node to Windows host machine
Before you deploy your cache node to a Windows host machine, make sure you have met the prerequisites listed here: [Host machine requirements](mcc-ent-prerequisites.md)
Use the following link to download and extract the Windows-compatible MCCE provisioning package onto the host machine.
-[Download MCCE provisioning package for Windows host machine](https://aka.ms/MCC-Ent-InstallScript-WSL)
+[Download MCC provisioning package for Windows host machine](https://aka.ms/MCC-Ent-InstallScript-WSL)
->[!IMPORTANT]
->Before you execute the provisioning command, make sure you change directory to the extracted provisioning package and set the script execution permissions by running the command below.
-```azurepowershell-interactive
-Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process
-```
-
-If you're using a **Group Managed Service Account**, replace the values in the following provisioning command before running it.
-
-```powershell-interactive
-./provisionmcconwsl.ps1 -installationFolder c:\mccwsl01 -customerid enter mccResourceId here -cachenodeid enter cacheNodeId here -customerkey enter customerKey here -registrationkey enter registration key -cacheDrives "/var/mcc,enter drive size" -shouldUseProxy $true -proxyurl " http://enter proxy host name:enter port" -mccRunTimeAccount $User
-```
+To deploy the cache node to a **Windows** host machine, see [Deploy cache node to Windows](mcc-ent-deploy-to-windows.md)
->[!IMPORTANT]
->'shoulduseproxy' parameter is required, whether or not your network uses proxy to access internet.
-
-If you're using **Local User account** or **Domain User account**, replace the values in the following provisioning command before running it.
-
-```powershell-interactive
-./provisionmcconwsl.ps1 -installationFolder c:\mccwsl01 -customerid enter mccResourceId here -cachenodeid enter cacheNodeId here -customerkey enter customerKey here -registrationkey enter registration key -cacheDrives "/var/mcc,enter drive size" -shouldUseProxy $true -proxyurl " http://enter proxy host name:enter port" -mccRunTimeAccount $User -mccLocalAccountCredential $myLocalAccountCredential
-```
-
-
-
->[!IMPORTANT]
->'shoulduseproxy' parameter is required, whether or not your network uses proxy to access internet.
-
-
## Next step
To verify cache node functionality, see [Verify cache node functionality](mcc-ent-verify-cache-node.md)
diff --git a/windows/deployment/do/mcc-ent-prerequisites.md b/windows/deployment/do/mcc-ent-prerequisites.md
index de980b7fa0..348b53caec 100644
--- a/windows/deployment/do/mcc-ent-prerequisites.md
+++ b/windows/deployment/do/mcc-ent-prerequisites.md
@@ -23,11 +23,6 @@ This article details the requirements and recommendations for using Microsoft Co
If you don't have an Azure subscription already, you can create an Azure [pay-as-you-go](https://azure.microsoft.com/offers/ms-azr-0003p/) account, which requires a credit card for verification purposes. For more information, see the [Azure Free Account FAQ](https://azure.microsoft.com/free/free-account-faq/).
-<<<<<<< HEAD
- The resources used for the preview and in the future when this product is ready for production will be free to you, like other caching solutions.
-1. **Hardware to host MCC**: The recommended configuration serves approximately 35,000 managed devices, downloading a 2-GB payload in 24-hour timeframe at a sustained rate of 6.5 Gbps.
-
-=======
The Azure resources used for MCCE will be free to you during this public preview.
- **E3/E5 or A3/A5 license**: Your organization must have one of the following license subscriptions for each device that downloads content from an MCCE cache node.
@@ -75,4 +70,3 @@ This article details the requirements and recommendations for using Microsoft Co
|Disk | SSD
1 drive
50 GB each |SSD
1 drive
200 GB each |
|Memory | 4 GB | 8 GB |
|Cores | 4 | 8 |
->>>>>>> baff7906fe02b76b4a3649d7e6c3acdac9534e66