Skip to content

Commit 7944991

Browse files
committed
Clarify examples and read me
1 parent 3cb80ce commit 7944991

File tree

7 files changed

+47
-27
lines changed

7 files changed

+47
-27
lines changed

quickstart/101-machine-learning/main.tf

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1+
terraform {
2+
required_version = ">=0.15.0"
3+
4+
required_providers {
5+
azurerm = {
6+
source = "hashicorp/azurerm"
7+
version = "=2.56.0"
8+
}
9+
}
10+
}
11+
112
provider "azurerm" {
2-
version = "~>2.0"
3-
features {}
13+
features {}
414
}
515

616
data "azurerm_client_config" "current" {}

quickstart/101-machine-learning/readme.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@ This template describes the minimal set of resources you require to get started
2727
## Usage
2828

2929
```bash
30-
terraform plan \
31-
-var 'name=azureml999' \
32-
-var 'environment=dev' \
33-
-var 'location=East US' \
34-
-out demo.tfplan
30+
terraform plan -var name=azureml567 -out demo.tfplan
3531

36-
terraform apply demo.tfplan
32+
terraform apply "demo.tfplan"
3733
```
38-
39-
\* Example shown with [Bash](https://www.gnu.org/software/bash/). For [Powershell](https://docs.microsoft.com/en-us/powershell/) replace backslashes with backticks.
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1+
terraform {
2+
required_version = ">=0.15.0"
3+
4+
required_providers {
5+
azurerm = {
6+
source = "hashicorp/azurerm"
7+
version = "=2.72.0"
8+
}
9+
}
10+
}
11+
112
provider "azurerm" {
2-
version = "~>2.0"
3-
features {}
13+
features {}
414
}
515

616
data "azurerm_client_config" "current" {}
717

818
resource "azurerm_resource_group" "default" {
919
name = "${var.name}-${var.environment}-rgp"
1020
location = "${var.location}"
11-
}
21+
}

quickstart/201-machine-learning-private/network.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Virtual Network resources
1+
# Virtual Network
22
resource "azurerm_virtual_network" "default" {
33
name = "${var.name}-${var.environment}-vnet"
4-
address_space = ["10.0.0.0/16"]
4+
address_space = var.vnet_address_space
55
location = azurerm_resource_group.default.location
66
resource_group_name = azurerm_resource_group.default.name
77
}
@@ -10,11 +10,11 @@ resource "azurerm_subnet" "mlsubnet" {
1010
name = "mlsubnet"
1111
resource_group_name = azurerm_resource_group.default.name
1212
virtual_network_name = azurerm_virtual_network.default.name
13-
address_prefixes = ["10.0.1.0/24"]
13+
address_prefixes = var.subnet_address_space
1414
enforce_private_link_endpoint_network_policies = true
1515
}
1616

17-
# DNS zones
17+
# Private DNS Zones
1818
resource "azurerm_private_dns_zone" "dnsvault" {
1919
name = "privatelink.vaultcore.azure.net"
2020
resource_group_name = azurerm_resource_group.default.name

quickstart/201-machine-learning-private/readme.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,7 @@ To learn more about security configurations in Azure Machine Learning, see [Ente
3838
## Usage
3939

4040
```bash
41-
terraform plan \
42-
-var 'name=azureml999' \
43-
-var 'environment=dev' \
44-
-var 'location=East US' \
45-
-out demo.tfplan
41+
terraform plan -var name=azureml567 -out demo.tfplan
4642

47-
terraform apply demo.tfplan
43+
terraform apply "demo.tfplan"
4844
```
49-
50-
\* Example shown with [Bash](https://www.gnu.org/software/bash/). For [Powershell](https://docs.microsoft.com/en-us/powershell/) replace backslashes with backticks.

quickstart/201-machine-learning-private/variables.tf

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variable "name" {
22
type = string
33
description = "Name of the deployment"
4-
default = "mlple999"
4+
default = "azureml568"
55
}
66

77
variable "environment" {
@@ -14,4 +14,16 @@ variable "location" {
1414
type = string
1515
description = "Location of the resources"
1616
default = "East US"
17+
}
18+
19+
variable "vnet_address_space" {
20+
type = list(string)
21+
description = "Address space of the subnet"
22+
default = ["10.0.0.0/16"]
23+
}
24+
25+
variable "subnet_address_space" {
26+
type = list(string)
27+
description = "Address space of the subnet"
28+
default = ["10.0.0.0/24"]
1729
}

quickstart/201-machine-learning-private/workspace.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Dependent resources for Azure Machine Learning
1+
# Dependent resources for the workspace
22
resource "azurerm_application_insights" "default" {
33
name = "${var.name}-${var.environment}-ain"
44
location = azurerm_resource_group.default.location

0 commit comments

Comments
 (0)