Skip to content

Commit ad14d88

Browse files
bmoore-msftazure-quickstart-templates pipeline
andauthored
remove v1 option (Azure#12913)
Co-authored-by: azure-quickstart-templates pipeline <[email protected]>
1 parent 8f0204b commit ad14d88

File tree

6 files changed

+6
-42
lines changed

6 files changed

+6
-42
lines changed

quickstarts/microsoft.compute/vms-with-selfhost-integration-runtime/README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ Before deploying the template you must have the following
2525
2. **Virtual Network.** The virtual machine will join this VNET. If you don't have one, use this tutorial, see [Create virtual network](https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-vnet-arm-pportal#create-a-virtual-network) to create one.
2626

2727
[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.compute%2Fvms-with-selfhost-integration-runtime%2Fazuredeploy.json) [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.compute%2Fvms-with-selfhost-integration-runtime%2Fazuredeploy.json)
28-
   
29-
30-
   
3128

3229
When you deploy this Azure Resource Template, you will create a logical selfhost IR in your data factory and the following resources
30+
3331
- Azure Virtual Machine
3432
- Azure Storage (for VM system image and boot diagnostic)
3533
- Public IP Address
@@ -38,7 +36,6 @@ When you deploy this Azure Resource Template, you will create a logical selfhost
3836

3937
This template can help you create self-hosted IR and make it workable in azure VMs. The VM must join in an existing VNET.
4038

41-
The below picture can help you find how to get vnet and subnet information.
42-
![](images/vnet.png)
39+
The below picture can help you find how to get ![vnet and subnet information](images/vnet.png).
4340

4441
`Tags: Microsoft.Resources/deployments, Microsoft.Network/networkSecurityGroups, Microsoft.Storage/storageAccounts, Microsoft.Compute/virtualMachines/extensions, CustomScriptExtension, Microsoft.DataFactory/dataFactories/gateways, Microsoft.DataFactory/factories/integrationruntimes, SelfHosted, Microsoft.Network/publicIPAddresses, Microsoft.Network/networkInterfaces, Microsoft.Compute/virtualMachines, Microsoft.Network/virtualNetworks, Microsoft.DataFactory/datafactories`

quickstarts/microsoft.compute/vms-with-selfhost-integration-runtime/azuredeploy.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@
1414
"description": "your existing data factory resource group"
1515
}
1616
},
17-
"existingDataFactoryVersion": {
18-
"type": "string",
19-
"metadata": {
20-
"description": "your existing data factory version"
21-
},
22-
"allowedValues": [
23-
"V1",
24-
"V2"
25-
]
26-
},
2717
"IntegrationRuntimeName": {
2818
"type": "string",
2919
"metadata": {
@@ -123,9 +113,6 @@
123113
"existingDataFactoryName": {
124114
"value": "[parameters('existingDataFactoryName')]"
125115
},
126-
"existingDataFactoryVersion": {
127-
"value": "[parameters('existingDataFactoryVersion')]"
128-
},
129116
"IntegrationRuntimeName": {
130117
"value": "[parameters('IntegrationRuntimeName')]"
131118
}
@@ -235,9 +222,6 @@
235222
"contentVersion": "1.0.0.0"
236223
},
237224
"parameters": {
238-
"existingDataFactoryVersion": {
239-
"value": "[parameters('existingDataFactoryVersion')]"
240-
},
241225
"datafactoryId": {
242226
"value": "[reference(resourceId(parameters('existingDataFactoryResourceGroup'), 'Microsoft.Resources/deployments', 'nestedTemplate')).outputs.irId.value]"
243227
},

quickstarts/microsoft.compute/vms-with-selfhost-integration-runtime/azuredeploy.parameters.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
"existingDataFactoryResourceGroup": {
99
"value":"GET-PREREQ-resourceGroupName"
1010
},
11-
"existingDataFactoryVersion": {
12-
"value":"V1"
13-
},
1411
"IntegrationRuntimeName": {
1512
"value":"GEN-UNIQUE"
1613
},

quickstarts/microsoft.compute/vms-with-selfhost-integration-runtime/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"description": "This template creates a selfhost integration runtime and registers it on Azure virtual machines",
99
"summary": "Install and register selfhost IR on Windows virtual machines using the custom script extension",
1010
"githubUsername": "xiaoyinglj",
11-
"dateUpdated": "2021-06-10"
11+
"dateUpdated": "2022-10-13"
1212
}

quickstarts/microsoft.compute/vms-with-selfhost-integration-runtime/nested/IRtemplate.json

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
"existingDataFactoryName": {
66
"type": "string"
77
},
8-
"existingDataFactoryVersion": {
9-
"type": "string"
10-
},
118
"IntegrationRuntimeName": {
129
"type": "string"
1310
}
@@ -16,17 +13,6 @@
1613
},
1714
"resources": [
1815
{
19-
"condition": "[equals(parameters('existingDataFactoryVersion'), 'V1')]",
20-
"type": "Microsoft.DataFactory/dataFactories/gateways",
21-
"apiVersion": "2015-10-01",
22-
"name": "[concat(parameters('existingDataFactoryName'), '/', parameters('IntegrationRuntimeName'))]",
23-
"properties": {
24-
"multiNodeSupportEnabled": true,
25-
"description": "my integration runtime"
26-
}
27-
},
28-
{
29-
"condition": "[equals(parameters('existingDataFactoryVersion'), 'V2')]",
3016
"type": "Microsoft.DataFactory/factories/integrationruntimes",
3117
"apiVersion": "2018-06-01",
3218
"name": "[concat(parameters('existingDataFactoryName'), '/', parameters('IntegrationRuntimeName'))]",
@@ -40,7 +26,7 @@
4026
"outputs": {
4127
"irId": {
4228
"type": "string",
43-
"value": "[resourceId(if(equals(parameters('existingDataFactoryVersion'), 'V2'), 'Microsoft.DataFactory/factories/integrationruntimes', 'Microsoft.DataFactory/dataFactories/gateways'), parameters('existingDataFactoryName'), parameters('IntegrationRuntimeName'))]"
29+
"value": "[resourceId('Microsoft.DataFactory/factories/integrationruntimes', parameters('existingDataFactoryName'), parameters('IntegrationRuntimeName'))]"
4430
}
4531
}
4632
}

quickstarts/microsoft.compute/vms-with-selfhost-integration-runtime/prereqs/prereq.azuredeploy.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
}
4141
},
4242
{
43-
"type": "Microsoft.DataFactory/datafactories",
44-
"apiVersion": "2015-10-01",
43+
"type": "Microsoft.DataFactory/factories",
44+
"apiVersion": "2018-06-01",
4545
"name": "[variables('datafactoryName')]",
4646
"location": "[parameters('dataFactoryLocation')]"
4747
}

0 commit comments

Comments
 (0)