From 2a3f1d7067399f5cadd4c4658e616e8bf2430575 Mon Sep 17 00:00:00 2001 From: Jan Egil Ring Date: Wed, 3 Jul 2024 11:41:51 +0200 Subject: [PATCH 1/2] Changed parameter customLocationRPOID to optional as it is not needed for all flavors Signed-off-by: Jan Egil Ring --- azure_jumpstart_arcbox/bicep/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_jumpstart_arcbox/bicep/main.bicep b/azure_jumpstart_arcbox/bicep/main.bicep index b8593d12bb..b13b9c7cc0 100644 --- a/azure_jumpstart_arcbox/bicep/main.bicep +++ b/azure_jumpstart_arcbox/bicep/main.bicep @@ -69,7 +69,7 @@ param guid string = substring(newGuid(),0,4) param location string = resourceGroup().location @description('The custom location RPO ID') -param customLocationRPOID string +param customLocationRPOID string? var templateBaseUrl = 'https://raw.githubusercontent.com/${githubAccount}/azure_arc/${githubBranch}/azure_jumpstart_arcbox/' var aksArcDataClusterName = 'ArcBox-AKS-Data-${guid}' From 69cb30745601a1553053b730d98328fef82720b6 Mon Sep 17 00:00:00 2001 From: Jan Egil Ring Date: Wed, 3 Jul 2024 11:42:39 +0200 Subject: [PATCH 2/2] Updated ArcBox to leverage bicepparam instead of json for example parameter file. Signed-off-by: Jan Egil Ring --- azure_jumpstart_arcbox/bicep/main.bicepparam | 21 ++++++++++++ .../bicep/main.parameters.json | 33 ------------------- 2 files changed, 21 insertions(+), 33 deletions(-) create mode 100644 azure_jumpstart_arcbox/bicep/main.bicepparam delete mode 100644 azure_jumpstart_arcbox/bicep/main.parameters.json diff --git a/azure_jumpstart_arcbox/bicep/main.bicepparam b/azure_jumpstart_arcbox/bicep/main.bicepparam new file mode 100644 index 0000000000..c0fa98c2bd --- /dev/null +++ b/azure_jumpstart_arcbox/bicep/main.bicepparam @@ -0,0 +1,21 @@ +using 'main.bicep' + +param sshRSAPublicKey = '' + +param spnClientId = '' + +param spnClientSecret = '' + +param spnTenantId = '' + +param windowsAdminUsername = 'arcdemo' + +param windowsAdminPassword = '' + +param logAnalyticsWorkspaceName = '' + +param flavor = 'ITPro' + +param deployBastion = false + +param vmAutologon = true diff --git a/azure_jumpstart_arcbox/bicep/main.parameters.json b/azure_jumpstart_arcbox/bicep/main.parameters.json deleted file mode 100644 index de33e2f3dd..0000000000 --- a/azure_jumpstart_arcbox/bicep/main.parameters.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "sshRSAPublicKey": { - "value": "" - }, - "spnClientId": { - "value": "" - }, - "spnClientSecret": { - "value": "" - }, - "spnTenantId": { - "value": "" - }, - "windowsAdminUsername": { - "value": "arcdemo" - }, - "windowsAdminPassword": { - "value": "" - }, - "logAnalyticsWorkspaceName": { - "value": "" - }, - "flavor": { - "value": "ITPro" - }, - "deployBastion": { - "value": false - } - } -}