Skip to content

Commit 5e2e074

Browse files
author
Manika Dhiman
committed
Merge branch 'main' into md-crash-dump
2 parents 7983668 + e5d6c26 commit 5e2e074

14 files changed

+268
-374
lines changed

azure-local/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ You can use the Azure portal for an increasing number of tasks including:
102102

103103
You can also subscribe to additional Azure hybrid services.
104104

105-
For more details on the cloud service components of Azure Local, see [Azure Local hybrid capabilities with Azure services](./hybrid-capabilities-with-azure-services-23h2.md
105+
For more details on the cloud service components of Azure Local, see [Azure Local hybrid capabilities with Azure services](./hybrid-capabilities-with-azure-services-23h2.md).
106106

107107
## What you need for Azure Local
108108

azure-stack/asdk/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ summary: Learn how to deploy and use the Azure Stack Development Kit.
66
metadata:
77
title: Azure Stack Development Kit Documentation - Tutorials, API Reference # Required; page title displayed in search results. Include the brand. < 60 chars.
88
description: The Azure Stack Development Kit (ASDK) is a single-node deployment of Azure Stack that you can download and use for free. The ASDK is meant to provide an environment in which you can evaluate Azure Stack and develop modern applications using APIs and tooling consistent with Azure in a non-production environment.
9-
ms.service: azure-stack
10-
ms.subservice: asdk
9+
ms.service: azure-stack-hub
10+
ms.subservice: azure-stack-hub-asdk
1111
ms.topic: landing-page
1212
author: sethmanheim
1313
ms.author: sethm

azure-stack/includes/note-powershell-adfs.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ author: sethmanheim
33
ms.author: sethm
44
ms.service: azure-stack
55
ms.topic: include
6-
ms.date: 2/1/2021
7-
ms.reviewer: thoroet
8-
ms.lastreviewed: 08/04/2020
6+
ms.date: 01/24/2025
97
---
108

11-
> [!Note]
12-
> AD FS only supports interactive authentication with user identities. If a credential object is required, you must use a service principal (SPN). For more information on setting up a service principal with Azure Stack Hub and AD FS as your identity management service, see [Manage an AD FS app identity](../operator/give-app-access-to-resources.md#manage-an-azure-ad-app).
9+
> [!NOTE]
10+
> AD FS only supports interactive authentication with user identities. If a credential object is required, you must use a service principal (SPN). For more information about setting up a service principal with Azure Stack Hub and AD FS as your identity management service, see [Manage an AD FS app identity](../operator/give-app-access-to-resources.md#manage-an-azure-ad-app).

azure-stack/includes/remove-account-az.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
title: Include for Remove-AzureRmAccount
33
description: An include file that explains how to run Remove-AzureRmAccount.
44
author: sethmanheim
5-
65
ms.topic: include
7-
ms.date: 11/23/2020
6+
ms.date: 01/23/2025
87
ms.author: sethm
9-
ms.reviewer: avishwan
108
ms.lastreviewed: 11/23/2020
119
---
1210

13-
>[!Note]
14-
>If your session expires, your password has changed, or you simply wish to switch accounts, run the following cmdlet before you sign in using Connect-AzAccount: `Remove-AzAccount -Scope Process`
11+
> [!NOTE]
12+
> If your session expires, your password has changed, or you want to switch accounts, run the following cmdlet before you sign in using `Connect-AzAccount`: `Remove-AzAccount -Scope Process`.

azure-stack/mdc/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ summary: Learn how to operate and use the Azure Modular Data Center (MDC).
66
metadata:
77
title: Azure Modular Data Center (MDC) Operator and User Documentation - Tutorials, Concepts, How to articles # Required; page title displayed in search results. Include the brand. < 60 chars.
88
description: The Azure Modular Data Center (MDC) is a modular data center that contains Azure Stack Hub solutions and storage. You can provide Azure services and host large scale compute and storage on-premises or at the edge, either disconnected from Azure or connected to it. It’s optimized for use cases that require data sovereignty and on-premises control.
9-
ms.service: azure-stack
10-
ms.subservice: asdk
9+
ms.service: azure-stack-hub
10+
ms.subservice: azure-stack-hub-mdc
1111
ms.topic: landing-page
1212
author: sethmanheim
1313
ms.author: sethm

azure-stack/operator/azure-stack-integrate-security.md

Lines changed: 76 additions & 86 deletions
Large diffs are not rendered by default.

azure-stack/operator/azure-stack-network.md

Lines changed: 20 additions & 33 deletions
Large diffs are not rendered by default.

azure-stack/operator/azure-stack-powershell-configure-admin.md

Lines changed: 7 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
title: Connect to Azure Stack Hub with PowerShell
33
description: Learn how to connect to Azure Stack Hub with PowerShell.
44
author: sethmanheim
5-
65
ms.topic: article
7-
ms.date: 2/1/2021
6+
ms.date: 01/24/2025
87
ms.author: sethm
98
ms.reviewer: thoroet
10-
ms.lastreviewed: 2/1/2021
9+
ms.lastreviewed: 02/01/2021
1110

1211
# Intent: As an Azure Stack operator, I want to learn how to connect to Azure Stack using Powershell.
1312
# Keyword: connect azure stack powershell
@@ -17,7 +16,7 @@ ms.lastreviewed: 2/1/2021
1716

1817
# Connect to Azure Stack Hub with PowerShell
1918

20-
You can configure Azure Stack Hub to use PowerShell to manage resources like creating offers, plans, quotas, and alerts. This topic helps you configure the operator environment.
19+
You can configure Azure Stack Hub to use PowerShell to manage resources like creating offers, plans, quotas, and alerts. This article helps you configure the operator environment.
2120

2221
## Prerequisites
2322

@@ -30,11 +29,9 @@ Run the following prerequisites either from the [Azure Stack Development Kit (AS
3029

3130
## Connect with Microsoft Entra ID
3231

33-
To configure the Azure Stack Hub operator environment with PowerShell, run one of the scripts below. Replace the Microsoft Entra tenantName and Azure Resource Manager endpoint values with your own environment configuration.
34-
35-
### [Az modules](#tab/az1)
32+
To configure the Azure Stack Hub operator environment with PowerShell, run the following script. Replace the Microsoft Entra tenantName and Azure Resource Manager endpoint values with your own environment configuration.
3633

37-
[!include[Remove Account](../includes/remove-account-az.md)]
34+
[!INCLUDE [remove-account-az](../includes/remove-account-az.md)]
3835

3936
```powershell
4037
# Register an Azure Resource Manager environment that targets your Azure Stack Hub instance. Get your Azure Resource Manager endpoint value from your service provider.
@@ -51,79 +48,17 @@ To configure the Azure Stack Hub operator environment with PowerShell, run one o
5148
# can be easily targeted at your Azure Stack Hub instance.
5249
Connect-AzAccount -EnvironmentName "AzureStackAdmin" -TenantId $TenantId
5350
```
54-
### [AzureRM modules](#tab/azurerm1)
55-
56-
[!include[Remove Account](../includes/remove-account-azurerm.md)]
57-
58-
```powershell
59-
# Register an Azure Resource Manager environment that targets your Azure Stack Hub instance. Get your Azure Resource Manager endpoint value from your service provider.
60-
Add-AzureRMEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" `
61-
-AzureKeyVaultDnsSuffix adminvault.local.azurestack.external `
62-
-AzureKeyVaultServiceEndpointResourceId https://adminvault.local.azurestack.external
63-
64-
# Set your tenant name.
65-
$AuthEndpoint = (Get-AzureRmEnvironment -Name "AzureStackAdmin").ActiveDirectoryAuthority.TrimEnd('/')
66-
$AADTenantName = "<myDirectoryTenantName>.onmicrosoft.com"
67-
$TenantId = (invoke-restmethod "$($AuthEndpoint)/$($AADTenantName)/.well-known/openid-configuration").issuer.TrimEnd('/').Split('/')[-1]
68-
69-
# After signing in to your environment, Azure Stack Hub cmdlets
70-
# can be easily targeted at your Azure Stack Hub instance.
71-
Add-AzureRmAccount -EnvironmentName "AzureStackAdmin" -TenantId $TenantId
72-
```
73-
74-
---
75-
76-
77-
## Connect with AD FS
78-
79-
Connect to the Azure Stack Hub operator environment with PowerShell with Microsoft Entra ID Federated Services (Azure AD FS). For the ASDK, this Azure Resource Manager endpoint is set to `https://adminmanagement.local.azurestack.external`. To get the Azure Resource Manager endpoint for Azure Stack Hub integrated systems, contact your service provider.
8051

81-
### [Az modules](#tab/az2)
82-
83-
```powershell
84-
# Register an Azure Resource Manager environment that targets your Azure Stack Hub instance. Get your Azure Resource Manager endpoint value from your service provider.
85-
Add-AzEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" `
86-
-AzureKeyVaultDnsSuffix adminvault.local.azurestack.external `
87-
-AzureKeyVaultServiceEndpointResourceId https://adminvault.local.azurestack.external
88-
89-
# Sign in to your environment.
90-
Connect-AzAccount -EnvironmentName "AzureStackAdmin"
91-
```
92-
93-
### [AzureRM modules](#tab/azurerm2)
94-
95-
```powershell
96-
# Register an Azure Resource Manager environment that targets your Azure Stack Hub instance. Get your Azure Resource Manager endpoint value from your service provider.
97-
Add-AzureRMEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" `
98-
-AzureKeyVaultDnsSuffix adminvault.local.azurestack.external `
99-
-AzureKeyVaultServiceEndpointResourceId https://adminvault.local.azurestack.external
100-
101-
# Sign in to your environment.
102-
Login-AzureRmAccount -EnvironmentName "AzureStackAdmin"
103-
```
104-
105-
---
106-
107-
[!Include [AD FS only supports interactive authentication with user identities](../includes/note-powershell-adfs.md)]
52+
[!INCLUDE [note-powershell-adfs](../includes/note-powershell-adfs.md)]
10853

10954
## Test the connectivity
11055

111-
Now that you've got everything set-up, use PowerShell to create resources within Azure Stack Hub. For example, you can create a resource group for an app and add a virtual machine. Use the following command to create a resource group named **MyResourceGroup**.
56+
Now that you have everything set up, use PowerShell to create resources within Azure Stack Hub. For example, you can create a resource group for an app and add a virtual machine. Use the following command to create a resource group named **MyResourceGroup**:
11257

113-
### [Az modules](#tab/az3)
11458
```powershell
11559
New-AzResourceGroup -Name "MyResourceGroup" -Location "Local"
11660
```
11761

118-
### [AzureRM modules](#tab/azurerm3)
119-
120-
```powershell
121-
New-AzureRmResourceGroup -Name "MyResourceGroup" -Location "Local"
122-
```
123-
124-
---
125-
126-
12762
## Next steps
12863

12964
- [Use PowerShell to manage subscriptions, plans, and offers in Azure Stack Hub](azure-stack-powershell-plan-offer.md)

azure-stack/partner/index.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ summary: Learn how to validate your hardware to host Azure Stack Hub. Validation
66
metadata:
77
title: Azure Stack Hub partner # Required; page title displayed in search results. Include the brand. < 60 chars.
88
description: Learn how to validate your hardware to host Azure Stack Hub. Validation as a Service is a native Azure Service designed for use by solution partners who are co-engineering offerings with Microsoft.
9-
ms.service: azure-stack
10-
ms.subservice: partner
9+
ms.service: azure-stack-hub
1110
ms.topic: landing-page
1211
author: sethmanheim
1312
ms.author: sethm

azure-stack/user/azure-stack-dev-start-howto-vm-python.md

Lines changed: 58 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
title: Deploy Python web app to VM in Azure Stack Hub
33
description: Deploy a Python web app to a virtual machine in Azure Stack Hub.
44
author: sethmanheim
5-
65
ms.topic: how-to
7-
ms.date: 9/29/2021
6+
ms.date: 01/24/2025
87
ms.author: sethm
98
ms.reviewer: thoroet
10-
ms.lastreviewed: 9/29/2021
9+
ms.lastreviewed: 09/29/2021
1110

1211
# Intent: As an Azure Stack Hub user, I want to deploy a Python web app to a virtual machine in Azure Stack Hub.
1312
# Keyword: deploy python webapp VM azure stack hub
@@ -18,100 +17,97 @@ ms.lastreviewed: 9/29/2021
1817
You can create a VM to host your Python web app in Azure Stack Hub. In this article, you set up a server, configure the server to host your Python web app, and then deploy the app to Azure Stack Hub.
1918

2019
This article uses Python 3.x running Flask in a virtual environment on an Nginx server. Use **Ubuntu Server 18.04 LTS** from the Azure Stack Hub Marketplace.
20+
2121
## Create a VM
2222

2323
1. Set up your VM in Azure Stack Hub by following the instructions in [Deploy a Linux VM to host a web app in Azure Stack Hub](azure-stack-dev-start-howto-deploy-linux.md). Use **Ubuntu Server 18.04 LTS** from the Azure Stack Hub Marketplace.
24+
1. In the VM network pane, make sure that the following ports are accessible:
2425

25-
2. In the VM network pane, make sure that the following ports are accessible:
26-
27-
| Port | Protocol | Description |
28-
| --- | --- | --- |
29-
| 80 | HTTP | Hypertext Transfer Protocol (HTTP) is the protocol that's used to deliver webpages from servers. Clients connect via HTTP with a DNS name or IP address. |
30-
| 443 | HTTPS | Hypertext Transfer Protocol Secure (HTTPS) is a secure version of HTTP that requires a security certificate and allows for the encrypted transmission of information. |
31-
| 22 | SSH | Secure Shell (SSH) is an encrypted network protocol for secure communications. You use this connection with an SSH client to configure the VM and deploy the app. |
32-
| 3389 | RDP | Optional. The Remote Desktop Protocol (RDP) allows a remote desktop connection to use a graphic user interface on your machine. |
33-
| 5000, 8000 | Custom | The ports that are used by the Flask web framework in development. For a production server, you route your traffic through 80 and 443. |
26+
| Port | Protocol | Description |
27+
| --- | --- | --- |
28+
| 80 | HTTP | Hypertext Transfer Protocol (HTTP) is the protocol that's used to deliver webpages from servers. Clients connect via HTTP with a DNS name or IP address. |
29+
| 443 | HTTPS | Hypertext Transfer Protocol Secure (HTTPS) is a secure version of HTTP that requires a security certificate and allows for the encrypted transmission of information. |
30+
| 22 | SSH | Secure Shell (SSH) is an encrypted network protocol for secure communications. You use this connection with an SSH client to configure the VM and deploy the app. |
31+
| 3389 | RDP | Optional. The Remote Desktop Protocol (RDP) allows a remote desktop connection to use a graphic user interface on your machine. |
32+
| 5000, 8000 | Custom | The ports that are used by the Flask web framework in development. For a production server, you route your traffic through 80 and 443. |
3433

35-
3. In the **Overview** pane, select **configure** under DNS name.
36-
37-
4. Select **static** and then name the machine so that you have a DNS name such as: `<yourmachine>.<local>.cloudapp.azurestack.contoso.com`.
34+
1. In the **Overview** pane, select **configure** under DNS name.
35+
1. Select **static** and then name the machine so that you have a DNS name such as: `<yourmachine>.<local>.cloudapp.azurestack.contoso.com`.
3836

3937
## Install Python
4038

4139
1. Connect to your VM by using your SSH client. For instructions, see [Connect via SSH with PuTTy](azure-stack-dev-start-howto-ssh-public-key.md#connect-with-ssh-by-using-putty).
42-
2. At your bash prompt on your VM, enter the following command:
40+
1. At your bash prompt on your VM, enter the following command:
4341

44-
```bash
45-
sudo apt-get update
46-
sudo apt-get -y install python3 python3-dev
47-
sudo apt install python3-pip
48-
```
42+
```bash
43+
sudo apt-get update
44+
sudo apt-get -y install python3 python3-dev
45+
sudo apt install python3-pip
46+
```
4947

50-
3. Validate your installation. While you're still connected to your VM in your SSH session, enter the following command to open Python and note the version number. Then type `quit()` to exit the Python REPL.
48+
1. Validate your installation. While you're still connected to your VM in your SSH session, enter the following command to open Python and note the version number. Then type `quit()` to exit the Python REPL.
5149

52-
```bash
53-
python3
54-
quit()
55-
```
50+
```bash
51+
python3
52+
quit()
53+
```
5654

57-
3. [Install Nginx](https://www.nginx.com/resources/wiki/), a lightweight web server. While you're still connected to your VM in your SSH session, enter the following command:
55+
1. [Install Nginx](https://www.nginx.com/resources/wiki/), a lightweight web server. While you're still connected to your VM in your SSH session, enter the following command:
5856

59-
```bash
60-
sudo apt-get -y install nginx
61-
```
57+
```bash
58+
sudo apt-get -y install nginx
59+
```
6260

63-
4. [Install Git](https://git-scm.com), a widely distributed version control and source code management (SCM) system. While you're still connected to your VM in your SSH session, enter the following command:
61+
1. [Install Git](https://git-scm.com). While you're still connected to your VM in your SSH session, enter the following command:
6462

65-
```bash
66-
sudo apt-get -y install git
67-
```
63+
```bash
64+
sudo apt-get -y install git
65+
```
6866

6967
## Deploy and run the app
7068

7169
1. Set up your Git repository on the VM. While you're still connected to your VM in your SSH session, enter the following commands:
7270

73-
```bash
74-
git clone https://github.com/Azure-Samples/azure-stack-hub-flask-hello-world.git
75-
76-
cd azure-stack-hub-flask-hello-world
77-
```
71+
```bash
72+
git clone https://github.com/Azure-Samples/azure-stack-hub-flask-hello-world.git
73+
cd azure-stack-hub-flask-hello-world
74+
```
7875

79-
2. While you're still connected to your VM in your SSH session, enter the following commands to install the dependencies. Install Flask using apt, and then pip to load the modules from `requirements.txt`.
76+
1. While you're still connected to your VM in your SSH session, enter the following commands to install the dependencies. Install Flask using apt, and then pip to load the modules from `requirements.txt`:
8077

81-
```bash
82-
sudo apt install python3-flask
83-
pip3 install -r requirements.txt
78+
```bash
79+
sudo apt install python3-flask
80+
pip3 install -r requirements.txt
8481

85-
export FLASK_APP=application.py
86-
flask run -h 0.0.0.0
87-
```
82+
export FLASK_APP=application.py
83+
flask run -h 0.0.0.0
84+
```
8885

89-
3. Go to your new server. You should see your running web application.
86+
1. Go to your new server. You should see your running web application.
9087

91-
```HTTP
92-
<yourmachine>.<local>.cloudapp.azurestack.contoso.com:5000
93-
```
88+
```HTTP
89+
<yourmachine>.<local>.cloudapp.azurestack.contoso.com:5000
90+
```
9491

9592
## Update your server
9693

9794
1. Connect to your VM in your SSH session. Stop the server by typing Ctrl+C.
95+
1. Enter the following commands:
9896

99-
2. Enter the following commands:
100-
101-
```bash
102-
cd azure-stack-hub-flask-hello-world
103-
git pull
104-
```
97+
```bash
98+
cd azure-stack-hub-flask-hello-world
99+
git pull
100+
```
105101

106-
3. Activate the virtual environment and start the app:
102+
1. Activate the virtual environment and start the app:
107103

108-
```bash
109-
export FLASK_APP=application.py
110-
flask run -h 0.0.0.0
111-
```
104+
```bash
105+
export FLASK_APP=application.py
106+
flask run -h 0.0.0.0
107+
```
112108

113109
## Next steps
114110

115-
- Learn more about how to [develop for Azure Stack Hub](azure-stack-dev-start.md).
111+
- Learn more about [how to develop for Azure Stack Hub](azure-stack-dev-start.md).
116112
- Learn about [common deployments for Azure Stack Hub as IaaS](azure-stack-dev-start-deploy-app.md).
117113
- To learn the Python programming language and find additional resources for Python, see [Python.org](https://www.python.org).

0 commit comments

Comments
 (0)