Merge pull request #302111 from tfitzmac/0701edit5

copy edit

Author: v-dirichards

articles/cyclecloud/how-to/ccws/connect-to-login-node-with-bastion.md

@@ -1,24 +1,25 @@
 ---
 title: How to connect to a Login Node through Bastion
-description: How to securily connect using SSH to a Login Node through Bastion
+description: How to securely connect using SSH to a Sign-In Node through Bastion
 author: xpillons
-ms.date: 05/27/2025
+ms.date: 07/01/2025
 ms.author: padmalathas
 ---
 
-# How to connect to a Login Node through Bastion
-There's no SSH route open from your local environment to Virtual Machines running in an Azure CycleCloud Workspace for Slurm by default for security reasons. However, an Azure Bastion can be deployed and used to SSH through to your Virtual Machines. Below are the instructions on how to do based on this documentation: [Connect to a VM using Bastion](/azure/bastion/connect-vm-native-client-linux).
+# How to connect to an authentication node through Bastion
 
-## Step 1 – Identify the SSH private key locally
-Locate the private SSH key file associated with the public key provided during the deployment. If it isn't accessible locally, then download it.
+For security reasons, there's no SSH route open from your local environment to virtual machines running in an Azure CycleCloud Workspace for Slurm. However, you can deploy an Azure Bastion and use it to SSH to your virtual machines. The following instructions explain how to set up the connection. For more information, see [Connect to a VM using Bastion](/azure/bastion/connect-vm-native-client-linux).
 
-## Step 2 – Retrieve the Resource ID of the Login Node
-From the CycleCloud UI, select the Login node to which you want to connect and double click on that line to open the detail view of the node. Select the VM tab to display the resource details below and copy the `ResourceId`.
+## Step 1 – Find the SSH private key on your computer
+Find the private SSH key file that matches the public key you provide during deployment. If you can't find the key on your computer, download it.
 
-:::image type="content" source="../../images/ccws/login-node-resource-id.png" alt-text="Login Node properties":::
+## Step 2 – Get the resource ID of the authentication node
+In the CycleCloud UI, select the authentication node you want to connect to and double-click that line to open the detail view for the node. Select the **VM** tab to display the resource details, and copy the `ResourceId`.
+
+:::image type="content" source="../../images/ccws/login-node-resource-id.png" alt-text="Screenshot of authentication node properties.":::
 
 ## Step 3 – Create a connect script
-Create a login script using the template below. Paste the login node `resourceID` retrieved above and specify the resource group and the private SSH key file to use.
+Create an authentication script using the following template. Paste the authentication node `resourceID` from the previous step, and specify the resource group and the private SSH key file to use.
 
 ```bash
 #!/bin/bash
@@ -28,7 +29,8 @@ resourceGroup=$(echo $resourceId | cut -d'/' -f5)
 az network bastion ssh --name bastion --resource-group $resourceGroup --target-resource-id $resourceId --auth-type ssh-key --username hpcadmin --ssh-key hpcadmin_id_rsa
 ```
 
-> Note: The github repository https://github.com/Azure/cyclecloud-slurm-workspace.git contains the utility script `./util/ssh_thru_bastion.sh` to help connecting.
+> [!NOTE]
+> The GitHub repository https://github.com/Azure/cyclecloud-slurm-workspace.git contains the utility script `./util/ssh_thru_bastion.sh` to help with connecting.
 
 ## Step 4 - Connect
-Run the script created/updated above to SSH on the login node.
+Run the preceding script to SSH to the authentication node.

articles/cyclecloud/how-to/ccws/connect-to-portal-with-bastion.md

@@ -2,18 +2,18 @@
 title: How to connect to the CycleCloud Portal through Bastion
 description: How to securely connect to the CycleCloud Portal using Bastion
 author: xpillons
-ms.date: 05/27/2025
+ms.date: 07/01/2025
 ms.author: padmalathas
 ---
 
 # How to connect to the CycleCloud Portal through Bastion
 You can deploy an Azure Bastion to establish an SSH tunnel to your Azure CycleCloud virtual machine when the HTTPS route is unavailable in your local environment. For detailed instructions, see [Connect to a VM - tunnel command](/azure/bastion/connect-vm-native-client-linux#tunnel).
 
-## Step 1 – Retrieve the Resource ID of the CycleCloud VM
-To retrieve the resource ID of the `ccw-cyclecloud-vm` virtual machine, navigate to the Azure portal. From the virtual machine view, select **Settings**, then **Properties**, and you'll find the **ResourceID**.
+## Step 1 – Retrieve the resource ID of the CycleCloud VM
+To retrieve the resource ID of the `ccw-cyclecloud-vm` virtual machine, go to the Azure portal. From the virtual machine view, select **Settings**, then **Properties**, and you find the **ResourceID**.
 
 ## Step 2 – Create a connect script
-Create a bash script using the template below. Paste the CycleCloud `resourceID` retrieved above.
+Create a bash script using the following template. Paste the CycleCloud `resourceID` that you got earlier.
 
 ```bash
 #!/bin/bash
@@ -24,12 +24,13 @@ resourceGroup=$(echo $resourceId | cut -d'/' -f5)
 az network bastion tunnel --name bastion --resource-group $resourceGroup --target-resource-id $resourceId --resource-port 443 --port 8443
 ```
 
-> Note: The github repository https://github.com/Azure/cyclecloud-slurm-workspace.git contains the utility script _./util/tunnel_thru_bastion.sh_ to help connecting.
+> [!NOTE]
+> The GitHub repository https://github.com/Azure/cyclecloud-slurm-workspace.git contains the utility script _./util/tunnel_thru_bastion.sh_ to help connecting.
 
 
 ## Step 3 - Create the tunnel
-Run the script created/updated above to start the SSH tunnel.
+Run the script you created or updated to start the SSH tunnel.
 
 ## Step 4 - Connect to CycleCloud
 
-Browse to `https://localhost:8443` and connect to CycleCloud.
+Go to `https://localhost:8443` and connect to CycleCloud.

articles/cyclecloud/how-to/ccws/deploy-with-cli.md

@@ -2,47 +2,47 @@
 title: How to deploy a CycleCloud Workspace for Slurm environment using the CLI
 description: How to deploy a CycleCloud Workspace for Slurm environment using the Azure CLI and the Azure portal UI Sandbox
 author: xpillons
-ms.date: 05/27/2025
+ms.date: 07/01/2025
 ms.author: padmalathas
 ---
 
 # How to deploy a CycleCloud Workspace for Slurm environment using the CLI
 
-Prerequisites: Users need to install the Azure CLI and Git and then sign into or set their Azure subscription.
+Prerequisites: Install the Azure CLI and Git, and then sign in or set your Azure subscription.
 > [!IMPORTANT]
-> Execute the following command from a Linux shell where Azure CLI is installed and authenticated with the Azure account designated for deployment. Please note that Azure Cloud Shell isn't supported for this scenario.
+> Run the following command from a Linux shell where Azure CLI is installed and authenticated with the Azure account designated for deployment. Azure Cloud Shell isn't supported for this scenario.
 
-- Clone the Azure CycleCloud Workspace for Slurm on the latest stable release
+1. Clone the Azure CycleCloud Workspace for Slurm on the latest stable release
 
-```bash
-git clone --depth 1 https://github.com/azure/cyclecloud-slurm-workspace.git
-```
+   ```bash
+   git clone --depth 1 https://github.com/azure/cyclecloud-slurm-workspace.git
+   ```
 
-- Copy the content of the UI definition file `./uidefinitions/createUiDefinition.json`
+1. Copy the content of the UI definition file `./uidefinitions/createUiDefinition.json`
 
-- Browse to the UI Definition Sandbox:
+1. Browse to the UI Definition Sandbox:
     - For Azure Public Cloud [Azure Public portal](https://portal.azure.com/#view/Microsoft_Azure_CreateUIDef/SandboxBlade)
     - For Azure US Gov [Azure US Gov portal](https://portal.azure.us/#view/Microsoft_Azure_CreateUIDef/SandboxBlade)
 
-- Paste the content of the UI Definition file into the multiline text box in the right,
-- Click `Preview >>` in the bottom-left corner to bring up a UI experience. 
-- Proceed through each page of the UI flow to ensure that necessary values populate in the output payload described in the next step,
-- Proceed with the UI flow to the `Review + create` page and then click the link labeled `View outputs payload` to the right of the `Create` button to generate a pane with JSON-formatted text in its body on the right-hand side of the browser window,
-- Copy the JSON-formatted text into a local JSON file, 
-- Save it as `parameters.json` and make note of the path to it. This is what we call the Parameters File for the deployment,
-- Open the shell of choice and navigate to the folder/directory that contains the `cyclecloud-slurm-workspace` repository cloned above,
-- Accept the terms of the Cycle image plan:  
-
-```bash
-az vm image terms accept --urn azurecyclecloud:azure-cyclecloud:cyclecloud8-gen2:latest
-```
-- Run the following deployment command in shell. Substitutions should be made for fields with square brackets (be sure to delete brackets). The instructions below assume that the current directory is as described in the previous step,
-
-```bash
-az deployment sub create --template-file ./cyclecloud-slurm-workspace/bicep/mainTemplate.bicep --parameters parameters.json --location [ANY AZURE LOCATION E.G. eastus] --name [OPTIONAL BUT HELPFUL, DELETE IF UNUSED] 
-```
-
-- Wait until the shell indicates that the deployment was successful. One can also track the progress of the deployment in the Azure portal by navigating to the resource group indicated in the UI, selecting `Deployments` from the Settings dropdown menu on the left-hand side menu, and checking the Status of the Deployment Name that begins with “pid-” at the bottom of the displayed list.
+1. Paste the content of the UI Definition file into the multiline text box on the right.
+1. Select `Preview >>` in the bottom-left corner to bring up a UI experience. 
+1. Go through each page of the UI flow to make sure that necessary values appear in the output payload described in the next step.
+1. Go through the UI flow to the `Review + create` page and then select the link labeled `View outputs payload` to the right of the `Create` button to generate a pane with JSON-formatted text in its body on the right-hand side of the browser window.
+1. Copy the JSON-formatted text into a local JSON file.
+1. Save it as `parameters.json` and note the path to it. This file is the Parameters File for the deployment.
+1. Open the shell of your choice and go to the folder or directory that contains the `cyclecloud-slurm-workspace` repository you cloned earlier.
+1. Accept the terms of the Cycle image plan:
+
+   ```bash
+   az vm image terms accept --urn azurecyclecloud:azure-cyclecloud:cyclecloud8-gen2:latest
+   ```
+1. Run the following deployment command in a shell. Substitute values for fields in square brackets (be sure to delete the brackets). The current directory is as described in the previous step.
+
+   ```bash
+   az deployment sub create --template-file ./cyclecloud-slurm-workspace/bicep/mainTemplate.bicep --parameters parameters.json --location [ANY AZURE LOCATION E.G. eastus] --name [OPTIONAL BUT HELPFUL, DELETE IF UNUSED] 
+   ```
+
+1. Wait until the shell indicates that the deployment was successful. You can also track the progress of the deployment in the Azure portal. Go to the resource group shown in the UI, select **Deployments** from the Settings menu, and check the status of the deployment name that begins with "pid-" at the bottom of the displayed list.
 
 ## Resources
 

articles/cyclecloud/how-to/ccws/open-ondemand-add-users.md

@@ -2,17 +2,18 @@
 title: Add users for Open OnDemand
 description: How to add users for Open OnDemand
 author: xpillons
-ms.date: 05/27/2025
+ms.date: 07/01/2025
 ms.author: padmalathas
 ---
 
 # Add users for Open OnDemand
-Once authenticated with Microsoft Entra ID, Open OnDemand maps the user to a local user account managed by CycleCloud created with the same name as the Microsoft Entra ID user. The following steps describe how to add cluster users for Open OnDemand.
-1. Browse the CycleCloud web portal and select the top right gear icon to open the menu. Select the **Users** option.
-1. Click on the **Add** button to add a new user. For more details on user management in CycleCloud, see instructions: [User Management](../../concepts/user-management.md)
-1. Select at least the role **Global Node User** for regular users and **Global Node Admin** for administrators (sudo access)
-1. Save
-1. Add other users as needed
-1. Wait for the users to be created on clusters. It may take a few minutes.
+After users authenticate with Microsoft Entra ID, Open OnDemand maps each user to a local user account that CycleCloud manages. CycleCloud creates the local user account with the same name as the Microsoft Entra ID user. The following steps describe how to add cluster users for Open OnDemand.
 
-Users can now log in to Open OnDemand using their Microsoft Entra ID credentials. A consent message may appear upon an initial login attempt: users should affirm consent to be redirected to the Open OnDemand dashboard.
+1. Browse the CycleCloud web portal and select the gear icon in the upper right corner to open the menu. Select the **Users** option.
+1. Select **Add** to add a new user. For more information about user management in CycleCloud, see [User Management](../../concepts/user-management.md).
+1. Select at least the **Global Node User** role for regular users and the **Global Node Admin** role for administrators (sudo access).
+1. Select **Save**.
+1. Add other users as needed.
+1. Wait for the users to be created on clusters. This process might take a few minutes.
+
+Users can now sign in to Open OnDemand with their Microsoft Entra ID credentials. A consent message might appear when users try to sign in for the first time. Users should give consent to be redirected to the Open OnDemand dashboard.