Merge pull request #40 from ARPA-H/deployment

updated monitoring rg name and change destroy-env.yml name
ARPA-H · Sep 3, 2024 · cd4e55f · cd4e55f
2 parents 6751833 + a43ab21
commit cd4e55f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/Destroy-Env.yml b/.github/workflows/Destroy-Env.yml
@@ -1,4 +1,4 @@
-name: Destroy NIH Test
+name: Destroy NIH Environment
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/scripts/Delete_RGs.sh b/.github/workflows/scripts/Delete_RGs.sh
@@ -4,7 +4,7 @@ echo "Environment: $1"
 
 # List of resource groups to delete
 #resource_groups=("avd-nih-arpah-test-use2-monitoring" "avd-nih-arpah-test-use2-network" "avd-nih-arpah-test-use2-pool-compute" "avd-nih-arpah-test-use2-service-objects" "rg-avd-test-use2-monitoring")
-resource_groups=("avd-nih-arpah-$1-use2-monitoring" "avd-nih-arpah-$1-use2-network" "avd-nih-arpah-$1-use2-pool-compute" "avd-nih-arpah-$1-use2-service-objects" "rg-avd-$1-use2-monitoring")
+resource_groups=("avd-nih-arpah-$1-use2-monitoring" "avd-nih-arpah-$1-use2-network" "avd-nih-arpah-$1-use2-pool-compute" "avd-nih-arpah-$1-use2-service-objects" "avd-nih-arpah-$1-use2-monitoring")
 
 # Loop through each resource group and delete
 for rg in "${resource_groups[@]}"; do

diff --git a/workload/bicep/parameters/deploy-baseline-parameters-arpah.json b/workload/bicep/parameters/deploy-baseline-parameters-arpah.json
@@ -26,7 +26,7 @@
         "avdWorkloadSubsId": {
             "value": "<<subscriptionId>>"
         },
-        "avdApplicationFriendlyName": {
+        "avdApplicationGroupCustomFriendlyName": {
             "value": "Windows 11 Desktop"
         },
         "deployPrivateEndpointKeyvaultStorage": {
@@ -152,12 +152,10 @@
         "zoneRedundantStorage": {
             "value": false
         },
-        "avsetFaultDomainCount": {
+        "vmssFlatformFaultDomainCount": {
             "value": 2
         },
-        "avsetUpdateDomainCount": {
-            "value": 5
-        },
+
         "fslogixStoragePerformance": {
             "value": "Premium"
         },

diff --git a/workload/bicep/parameters/deploy-baseline-parameters-example.json b/workload/bicep/parameters/deploy-baseline-parameters-example.json
@@ -140,9 +140,6 @@
         "zoneRedundantStorage": {
             "value": false
         },
-        "avsetFaultDomainCount": {
-            "value": 2
-        },
         "avsetUpdateDomainCount": {
             "value": 5
         },