diff --git a/data.tf b/data.tf index 248a8e0..b8cd9f7 100644 --- a/data.tf +++ b/data.tf @@ -1,5 +1,5 @@ data "vault_generic_secret" "vmware" { - path = "secret/vmware" + path = "secret/vmware" } data "vsphere_datacenter" "dc" { diff --git a/main.tf b/main.tf index 4c760f4..f163b5e 100644 --- a/main.tf +++ b/main.tf @@ -12,10 +12,10 @@ resource "vsphere_resource_pool" "resource_groups" { name = each.value.name parent_resource_pool_id = data.vsphere_compute_cluster.cluster.resource_pool_id - cpu_reservation = each.value.cpu_reservation - cpu_expandable = each.value.cpu_expandable - cpu_limit = each.value.cpu_limit - cpu_shares = lookup(local.shares_mapping, each.value.cpu_shares, 1000) + cpu_reservation = each.value.cpu_reservation + cpu_expandable = each.value.cpu_expandable + cpu_limit = each.value.cpu_limit + cpu_shares = lookup(local.shares_mapping, each.value.cpu_shares, 1000) memory_reservation = each.value.memory_reservation memory_expandable = each.value.memory_expandable diff --git a/provider.tf b/provider.tf index 59a6140..f60359d 100644 --- a/provider.tf +++ b/provider.tf @@ -15,15 +15,15 @@ terraform { # Configure the Vault provider provider "vault" { - address = "https://wbyc-srv-docker01.bsdserver.lan:8200" - skip_tls_verify = true - auth_login { - path = "auth/approle/login" - parameters = { - role_id = var.role_id - secret_id = var.secret_id - } + address = "https://wbyc-srv-docker01.bsdserver.lan:8200" + skip_tls_verify = true + auth_login { + path = "auth/approle/login" + parameters = { + role_id = var.role_id + secret_id = var.secret_id } + } } # vSphere Provider diff --git a/variables.tf b/variables.tf index 25dbede..a2eaef4 100644 --- a/variables.tf +++ b/variables.tf @@ -21,15 +21,15 @@ variable "environment" { # Resource Groups variable "resource_groups" { type = map(object({ - name = string - cpu_reservation = optional(number, 0) - cpu_expandable = optional(bool, true) - cpu_limit = optional(number, -1) - cpu_shares = optional(string, "normal") - memory_reservation = optional(number, 0) - memory_expandable = optional(bool, true) - memory_limit = optional(number, -1) - memory_shares = optional(string, "normal") + name = string + cpu_reservation = optional(number, 0) + cpu_expandable = optional(bool, true) + cpu_limit = optional(number, -1) + cpu_shares = optional(string, "normal") + memory_reservation = optional(number, 0) + memory_expandable = optional(bool, true) + memory_limit = optional(number, -1) + memory_shares = optional(string, "normal") })) description = "Map of resource groups to create" default = { @@ -53,13 +53,13 @@ variable "resource_groups" { # Vault approle variable "role_id" { - description = "Role ID for Vault AppRole authentication" - type = string - sensitive = true + description = "Role ID for Vault AppRole authentication" + type = string + sensitive = true } variable "secret_id" { - description = "Secret ID for Vault AppRole authentication" - type = string - sensitive = true + description = "Secret ID for Vault AppRole authentication" + type = string + sensitive = true }