Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.

Commit 3810da3

Browse files
initmaheshinitmahesh
authored
Merge pull request #236 from linkernetworks/linker
Update Factory (with Installer)
2 parents 922ea8c + 57d54d8 commit 3810da3

File tree

63 files changed

+1653
-655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1653
-655
lines changed

‎factory-ai-vision/Deploy/arm/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
## Deploy
44

5-
[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fgithub.com%2Flinkernetworks%2Fazure-intelligent-edge-patterns%2Fblob%2Fdevelop%2Ffactory-ai-vision%2FDeploy%2Farm%2Farmdeploy.json)
5+
[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Flinkernetworks%2Fazure-intelligent-edge-patterns%2Fdevelop%2Ffactory-ai-vision%2FDeploy%2Farm%2Farmdeploy.json)

‎factory-ai-vision/Deploy/arm/armdeploy.json‎

Lines changed: 31 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5-
"resourceGroupName": {
6-
"type": "string",
7-
"metadata": {
8-
"description": "Enter the name of resource group to be created for Iot Hub, Storage Account and Web App."
9-
}
10-
},
115
"deviceArchitecture": {
126
"defaultValue": "X86",
137
"allowedValues": ["X86", "ARM64"],
@@ -16,30 +10,9 @@
1610
"description": "Specify the architecture of the Edge Device. Currently supported values are 'X86' and 'ARM64'."
1711
}
1812
},
19-
"containerRegistryName": {
20-
"type": "string",
21-
"defaultValue": "factoryairegistry.azurecr.io",
22-
"metadata": {
23-
"description": "Container Registry Name."
24-
}
25-
},
26-
"containerRegistryUserName": {
27-
"type": "string",
28-
"defaultValue": "factoryairegistry",
29-
"metadata": {
30-
"description": "Container Registry Username."
31-
}
32-
},
33-
"containerRegistryPassword": {
34-
"type": "string",
35-
"defaultValue": "",
36-
"metadata": {
37-
"description": "Container Registry Password."
38-
}
39-
},
4013
"moduleRuntime": {
41-
"defaultValue": "CPU",
42-
"allowedValues": ["CPU", "NVIDIA", "MOVIDIUS"],
14+
"defaultValue": "cpu",
15+
"allowedValues": ["cpu", "gpu (NVIDIA)", "vpu (Movidius)"],
4316
"type": "string",
4417
"metadata": {
4518
"description": "Select value for runtime for Detector module on Edge Device. Set it to 'CPU' to use CPU to run detector module. If the Edge Device has Nvidia GPU, set it to 'NVIDIA' to use GPU to run detector module or to use movidius set it to 'MOVIDIUS'."
@@ -57,61 +30,55 @@
5730
"defaultValue": "",
5831
"type": "string",
5932
"metadata": {
60-
"description": "Enter the name of existing Iot Hub. This is required only if 'Use Existing Edge Device' is set to 'Yes'"
33+
"description": "Enter the name of existing Iot Hub."
6134
}
6235
},
6336
"edgeDeviceName": {
6437
"defaultValue": "",
6538
"type": "string",
6639
"metadata": {
67-
"description": "Enter the name of existing Iot Hub. This is required only if 'Use Existing Edge Device' is set to 'Yes'"
40+
"description": "Enter the name of existing Iot Hub Edge Device."
6841
}
6942
},
7043
"customVisionName": {
7144
"type": "string",
72-
"defaultValue": "mycustomvision"
45+
"metadata": {
46+
"description": "Enter the name of existing Custom Vision."
47+
}
7348
},
7449
"mediaServiceName": {
7550
"type": "string",
76-
"defaultValue": "myams"
51+
"metadata": {
52+
"description": "Enter the name of existing Azure Media Service."
53+
}
7754
},
7855
"mediaServiceServicePrincipalName": {
7956
"type": "string",
80-
"defaultValue": "myamsspname",
8157
"metadata": {
82-
"description": "Azure Media Service Principal name"
58+
"description": "Enter the name of existing Azure Media Service Principal name."
8359
}
8460
},
8561
"mediaServiceServicePrincipalSecret": {
86-
"type": "string",
87-
"defaultValue": "myamsspsecret",
62+
"type": "securestring",
8863
"metadata": {
89-
"defaultValue": "Azure Media Service Principal secret"
64+
"defaultValue": "Azure Media Service Principal secret."
9065
}
9166
}
9267
},
9368
"variables": {
94-
"location": "[deployment().location]",
95-
"resourceGroupName": "[parameters('resourceGroupName')]",
96-
"deploymentName": "[concat('factoryai-deployment',substring(uniqueString(subscription().id,parameters('resourceGroupName')),1,4))]",
97-
"managedIdentityName": "[concat('Managed_Identity',substring(uniqueString(subscription().id,parameters('resourceGroupName')),1,4))]",
98-
"managedIdentityResourceGroup": "[parameters('resourceGroupName')]"
69+
"resourceGroupName": "[resourceGroup().name]",
70+
"deploymentName": "[concat('factoryai-deployment',substring(uniqueString(subscription().id,variables('resourceGroupName')),1,4))]",
71+
"managedIdentityName": "[concat('Managed_Identity',substring(uniqueString(subscription().id,variables('resourceGroupName')),1,4))]",
72+
"managedIdentityResourceGroup": "[variables('resourceGroupName')]",
73+
"containerRegistryName": "docker.io",
74+
"containerRegistryUserName": "",
75+
"containerRegistryPassword": ""
9976
},
10077
"resources": [
101-
{
102-
"type": "Microsoft.Resources/resourceGroups",
103-
"apiVersion": "2020-06-01",
104-
"name": "[variables('resourceGroupName')]",
105-
"location": "[variables('location')]",
106-
"properties": {}
107-
},
10878
{
10979
"type": "Microsoft.Resources/deployments",
11080
"apiVersion": "2020-06-01",
11181
"name": "CreatingManagedIdentity",
112-
"dependsOn": [
113-
"[resourceId('Microsoft.Resources/resourceGroups/', parameters('resourceGroupName'))]"
114-
],
11582
"properties": {
11683
"mode": "Incremental",
11784
"template": {
@@ -124,12 +91,12 @@
12491
"type": "Microsoft.ManagedIdentity/userAssignedIdentities",
12592
"name": "[variables('managedIdentityName')]",
12693
"apiVersion": "2018-11-30",
127-
"location": "[variables('location')]"
94+
"location": "[resourceGroup().location]"
12895
}
12996
]
13097
}
13198
},
132-
"resourceGroup": "[parameters('resourceGroupName')]"
99+
"resourceGroup": "[variables('resourceGroupName')]"
133100
},
134101
{
135102
"type": "Microsoft.Resources/deployments",
@@ -170,25 +137,21 @@
170137
]
171138
}
172139
},
173-
"resourceGroup": "[parameters('resourceGroupName')]"
140+
"resourceGroup": "[variables('resourceGroupName')]"
174141
},
175142
{
176143
"type": "Microsoft.Resources/deployments",
177144
"apiVersion": "2020-06-01",
178145
"name": "ResourcesDeployment",
179-
"dependsOn": [
180-
"[resourceId('Microsoft.Resources/resourceGroups/', parameters('resourceGroupName'))]",
181-
"CreatingRoleAssignments",
182-
"CreatingManagedIdentity"
183-
],
146+
"dependsOn": ["CreatingRoleAssignments", "CreatingManagedIdentity"],
184147
"properties": {
185148
"mode": "Incremental",
186149
"expressionEvaluationOptions": {
187150
"scope": "inner"
188151
},
189152
"parameters": {
190153
"resourceGroupName": {
191-
"value": "[parameters('resourceGroupName')]"
154+
"value": "[variables('resourceGroupName')]"
192155
},
193156
"videoCaptureModule": {
194157
"value": "[parameters('videoCaptureModule')]"
@@ -206,7 +169,7 @@
206169
"value": "[parameters('iotHubName')]"
207170
},
208171
"resourceGroupLocation": {
209-
"value": "[variables('location')]"
172+
"value": "[resourceGroup().location]"
210173
},
211174
"deviceArchitecture": {
212175
"value": "[parameters('deviceArchitecture')]"
@@ -215,13 +178,13 @@
215178
"value": "[parameters('moduleRuntime')]"
216179
},
217180
"containerRegistryName": {
218-
"value": "[parameters('containerRegistryName')]"
181+
"value": "[variables('containerRegistryName')]"
219182
},
220183
"containerRegistryUserName": {
221-
"value": "[parameters('containerRegistryUserName')]"
184+
"value": "[variables('containerRegistryUserName')]"
222185
},
223186
"containerRegistryPassword": {
224-
"value": "[parameters('containerRegistryPassword')]"
187+
"value": "[variables('containerRegistryPassword')]"
225188
},
226189
"managedIdentityResourceGroup": {
227190
"value": "[variables('managedIdentityResourceGroup')]"
@@ -389,7 +352,7 @@
389352
]
390353
}
391354
},
392-
"resourceGroup": "[parameters('resourceGroupName')]"
355+
"resourceGroup": "[variables('resourceGroupName')]"
393356
}
394357
]
395358
}

0 commit comments

Comments
 (0)