Update openai model + cleanup

Author: aamini7

scenarios/AksOpenAiTerraform/terraform/main.tf

@@ -62,16 +62,16 @@ module "openai" {
   sku_name = "S0"
   deployments = [
     {
-      name = "gpt-35-turbo"
+      name = "gpt-4"
       model = {
-        name    = "gpt-35-turbo"
-        version = "0301"
+        name    = "gpt-4"
+        version = "turbo-2024-04-09"
       }
-      rai_policy_name = ""
     }
   ]
   custom_subdomain_name         = lower("${var.name_prefix}OpenAi")
   public_network_access_enabled = true
+  
   log_analytics_workspace_id    = module.log_analytics_workspace.id
   log_analytics_retention_days  = local.log_analytics_retention_days
 }
@@ -122,6 +122,7 @@ module "storage_account" {
   account_kind     = "StorageV2"
   account_tier     = "Standard"
   replication_type = "LRS"
+  is_hns_enabled   = false
 }
 
 module "key_vault" {

scenarios/AksOpenAiTerraform/terraform/modules/openai/variables.tf

@@ -30,7 +30,6 @@ variable "deployments" {
       name    = string
       version = string
     })
-    rai_policy_name = string
   }))
 }
 

scenarios/AksOpenAiTerraform/terraform/modules/storage_account/main.tf

@@ -7,16 +7,9 @@ resource "azurerm_storage_account" "storage_account" {
   account_tier             = var.account_tier
   account_replication_type = var.replication_type
   is_hns_enabled           = var.is_hns_enabled
-  tags                     = var.tags
 
   allow_nested_items_to_be_public = false
 
-  network_rules {
-    default_action             = (length(var.ip_rules) + length(var.virtual_network_subnet_ids)) > 0 ? "Deny" : var.default_action
-    ip_rules                   = var.ip_rules
-    virtual_network_subnet_ids = var.virtual_network_subnet_ids
-  }
-
   identity {
     type = "SystemAssigned"
   }

scenarios/AksOpenAiTerraform/terraform/modules/storage_account/variables.tf

@@ -1,81 +1,27 @@
 variable "resource_group_name" {
-  description = "(Required) Specifies the resource group name of the storage account"
   type        = string
 }
 
 variable "name" {
-  description = "(Required) Specifies the name of the storage account"
   type        = string
 }
 
 variable "location" {
-  description = "(Required) Specifies the location of the storage account"
   type        = string
 }
 
 variable "account_kind" {
-  description = "(Optional) Specifies the account kind of the storage account"
-  default     = "StorageV2"
   type        = string
-
-  validation {
-    condition     = contains(["Storage", "StorageV2"], var.account_kind)
-    error_message = "The account kind of the storage account is invalid."
-  }
 }
 
 variable "account_tier" {
-  description = "(Optional) Specifies the account tier of the storage account"
-  default     = "Standard"
   type        = string
-
-  validation {
-    condition     = contains(["Standard", "Premium"], var.account_tier)
-    error_message = "The account tier of the storage account is invalid."
-  }
 }
 
 variable "replication_type" {
-  description = "(Optional) Specifies the replication type of the storage account"
-  default     = "LRS"
   type        = string
-
-  validation {
-    condition     = contains(["LRS", "ZRS", "GRS", "GZRS", "RA-GRS", "RA-GZRS"], var.replication_type)
-    error_message = "The replication type of the storage account is invalid."
-  }
 }
 
 variable "is_hns_enabled" {
-  description = "(Optional) Specifies the replication type of the storage account"
-  default     = false
   type        = bool
-}
-
-variable "default_action" {
-  description = "Allow or disallow public access to all blobs or containers in the storage accounts. The default interpretation is true for this property."
-  default     = "Allow"
-  type        = string
-}
-
-variable "ip_rules" {
-  description = "Specifies IP rules for the storage account"
-  default     = []
-  type        = list(string)
-}
-
-variable "virtual_network_subnet_ids" {
-  description = "Specifies a list of resource ids for subnets"
-  default     = []
-  type        = list(string)
-}
-
-variable "kind" {
-  description = "(Optional) Specifies the kind of the storage account"
-  default     = ""
-}
-
-variable "tags" {
-  description = "(Optional) Specifies the tags of the storage account"
-  default     = {}
 }