Merge pull request #104 from Cobollatin/feature/batch

stuff
Cobollatin · May 26, 2024 · 95ea964 · 95ea964
2 parents 90b46fd + b13c326
commit 95ea964
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/infrastructure/README.md b/infrastructure/README.md
@@ -26,7 +26,6 @@ No modules.
 | Name | Type |
 |------|------|
 | [azurerm_batch_account.use2_main_batch](https://registry.terraform.io/providers/hashicorp/azurerm/3.105.0/docs/resources/batch_account) | resource |
-| [azurerm_batch_application.use2_main_batch_app](https://registry.terraform.io/providers/hashicorp/azurerm/3.105.0/docs/resources/batch_application) | resource |
 | [azurerm_batch_job.use2_main_batch_job](https://registry.terraform.io/providers/hashicorp/azurerm/3.105.0/docs/resources/batch_job) | resource |
 | [azurerm_batch_pool.use2_main_batch_pool](https://registry.terraform.io/providers/hashicorp/azurerm/3.105.0/docs/resources/batch_pool) | resource |
 | [azurerm_container_registry.use2_main_acr](https://registry.terraform.io/providers/hashicorp/azurerm/3.105.0/docs/resources/container_registry) | resource |

diff --git a/infrastructure/main.tf b/infrastructure/main.tf
@@ -590,7 +590,7 @@ resource "azurerm_subnet_network_security_group_association" "use2_bp_subnet_nsg
 }
 
 resource "azurerm_batch_pool" "use2_main_batch_pool" {
-  name                           = "${var.app_name}-${var.location_short}-${var.environment_name}-batch-pool-v2"
+  name                           = "${var.app_name}-${var.location_short}-${var.environment_name}-batch-pool-v1"
   resource_group_name            = azurerm_resource_group.use2_main_rg.name
   account_name                   = azurerm_batch_account.use2_main_batch.name
   node_agent_sku_id              = "batch.node.ubuntu 20.04"
@@ -667,15 +667,6 @@ EOF
   }
 }
 
-resource "azurerm_batch_application" "use2_main_batch_app" {
-  name                = "${var.app_name}-${var.location_short}-${var.environment_name}-batch-app"
-  resource_group_name = azurerm_resource_group.use2_main_rg.name
-  account_name        = azurerm_batch_account.use2_main_batch.name
-  allow_updates       = true
-  default_version     = "latest"
-  display_name        = "Batch Application"
-}
-
 resource "azurerm_role_assignment" "use2_main_batch_sa_role" {
   scope                = azurerm_resource_group.use2_main_rg.id
   role_definition_name = "Storage Blob Data Contributor"