Merge pull request #12 from InputObject2/hotfix/terraform-fmt

Fixed tf fmt so at least first run can pass

Author: InputObject2

local_mac_addressses.tf

@@ -4,18 +4,25 @@ terraform {
   required_providers {
     xenorchestra = {
       source  = "terra-farm/xenorchestra"
+      version = ">=0.26.1"
     }
     macaddress = {
-      source = "ivoronin/macaddress"
-      #version = "0.3.0"
-    }
-    gitlab = {
-      source = "gitlabhq/gitlab"
-      #version = "16.4.1"
+      source  = "ivoronin/macaddress"
+      version = ">=0.3.0"
     }
     sshcommand = {
-      source = "invidian/sshcommand"
-      #version = "0.2.2"
+      source  = "invidian/sshcommand"
+      version = ">=0.2.2"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = ">=3.2.2"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">=3.6.2"
     }
   }
+
+  required_version = ">= 1.0"
 }

providers.tf

@@ -48,7 +48,7 @@ variable "node_xoa_network_name" {
 variable "node_tags" {
   description = "Tags to apply to worker nodes"
   type        = list(string)
-  default     = [
+  default = [
     "xcp-ng.org/arch:amd64",
     "xcp-ng.org/os:ubuntu"
   ]
@@ -104,7 +104,7 @@ variable "master_xoa_network_name" {
 variable "master_tags" {
   description = "Tags to apply to master nodes"
   type        = list(string)
-  default     = [
+  default = [
     "xcp-ng.org/arch:amd64",
     "xcp-ng.org/os:ubuntu"
   ]
@@ -192,9 +192,9 @@ variable "dns_sub_zone" {
 }
 
 variable "cluster_name" {
-    description = "Name used in the virtual machine names, not an actual Kubernetes settings"
-    type        = string
-    default     = "my-cluster"
+  description = "Name used in the virtual machine names, not an actual Kubernetes settings"
+  type        = string
+  default     = "my-cluster"
 }
 
 variable "microk8s_version" {
@@ -206,7 +206,7 @@ variable "microk8s_version" {
 variable "cloud_network_config_template" {
   description = "Template for cloud network config"
   type        = string
-  default = <<EOF
+  default     = <<EOF
 network:
   version: 1
   config:
@@ -218,7 +218,7 @@ EOF
 }
 
 variable "tags" {
-    description = "A list of key+value pairs to apply to the deployment"
-    type = list(string)
-    default = []
+  description = "A list of key+value pairs to apply to the deployment"
+  type        = list(string)
+  default     = []
 }

variables.tf

@@ -1,9 +1,9 @@
 provider "xenorchestra" {
   # Configuration options
   # Must be ws or wss
-  url = var.xoa_api_url # Or set XOA_URL environment variable
-  #username = var.xoa_username              # Or set XOA_USER environment variable
-  #password = var.xoa_password              # Or set XOA_PASSWORD environment variable
+  url      = var.xoa_api_url    # Or set XOA_URL environment variable
+  username = var.xoa_username   # Or set XOA_USER environment variable
+  password = var.xoa_password   # Or set XOA_PASSWORD environment variable
   insecure = var.xoa_ignore_ssl # Or set XOA_INSECURE environment variable to any value
 }
 
@@ -12,25 +12,25 @@ provider "xenorchestra" {
 
 locals {
   master_pool_name = var.master_xoa_pool_name == null ? var.xoa_pool_name : var.master_xoa_pool_name
-  node_pool_name = var.node_xoa_pool_name == null ? var.xoa_pool_name : var.node_xoa_pool_name
-  master_network = var.master_xoa_network_name == null ? var.xoa_network_name : var.master_xoa_network_name
-  node_network = var.node_xoa_network_name == null ? var.xoa_network_name : var.node_xoa_network_name
+  node_pool_name   = var.node_xoa_pool_name == null ? var.xoa_pool_name : var.node_xoa_pool_name
+  master_network   = var.master_xoa_network_name == null ? var.xoa_network_name : var.master_xoa_network_name
+  node_network     = var.node_xoa_network_name == null ? var.xoa_network_name : var.node_xoa_network_name
 }
 
 data "xenorchestra_pool" "xcp_ng_master" {
-  name_label =  local.master_pool_name
+  name_label = local.master_pool_name
 }
 
 data "xenorchestra_pool" "xcp_ng_node" {
-  name_label =  local.node_pool_name
+  name_label = local.node_pool_name
 }
 
 data "xenorchestra_network" "master" {
-  pool_id = data.xenorchestra_pool.xcp_ng_master.id
+  pool_id    = data.xenorchestra_pool.xcp_ng_master.id
   name_label = local.master_network
 }
 
 data "xenorchestra_network" "node" {
-  pool_id = data.xenorchestra_pool.xcp_ng_node.id
+  pool_id    = data.xenorchestra_pool.xcp_ng_node.id
   name_label = local.node_network
 }

xen_data.tf

@@ -1,20 +1,20 @@
 resource "random_integer" "master" {
-    count = var.master_count
-    min   = 1000
-    max   = 9999
+  count = var.master_count
+  min   = 1000
+  max   = 9999
 }
 
 resource "random_uuid" "custom_token" {}
 
 locals {
   # Generate a random UUID and extract the first 32 characters
-  custom_token = substr(random_uuid.custom_token.result, 0, 32)
-  master_prefix = "${var.master_prefix}-${var.cluster_name}-master"
+  custom_token             = substr(random_uuid.custom_token.result, 0, 32)
+  master_prefix            = "${var.master_prefix}-${var.cluster_name}-master"
   microk8s_version_channel = var.microk8s_version == null ? "" : "--channel=${var.microk8s_version}"
 }
 
 resource "xenorchestra_cloud_config" "master" {
-  name  = "ubuntu-base-config-master-0-${var.cluster_name}"
+  name     = "ubuntu-base-config-master-0-${var.cluster_name}"
   template = <<EOF
 #cloud-config
 hostname: "${local.master_prefix}-${random_integer.master[0].result}.${var.cluster_dns_zone}"
@@ -166,23 +166,23 @@ resource "xenorchestra_vm" "master" {
   tags = concat(var.tags, var.master_tags, ["kubernetes.io/role:primary", "xcp-ng.org/deployment:${var.cluster_name}"])
 
   lifecycle {
-    ignore_changes = [ disk, affinity_host, template ]
+    ignore_changes = [disk, affinity_host, template]
   }
 }
 
 resource "null_resource" "sleep_while_master_readies_up" {
   provisioner "local-exec" {
-    command = "sleep 240"  # Sleep to until master is ready
+    command = "sleep 240" # Sleep to until master is ready
   }
 
-  depends_on = [ xenorchestra_vm.master ]
+  depends_on = [xenorchestra_vm.master]
 }
 
 resource "sshcommand_command" "get_kubeconfig" {
-  host               = xenorchestra_vm.master.ipv4_addresses[0]
-  command            = "sudo microk8s config get"
-  private_key        = file(var.private_ssh_key_path)
-  user = "cloud-user"
+  host        = xenorchestra_vm.master.ipv4_addresses[0]
+  command     = "sudo microk8s config get"
+  private_key = file(var.private_ssh_key_path)
+  user        = "cloud-user"
 
-  depends_on = [ null_resource.sleep_while_master_readies_up ]
+  depends_on = [null_resource.sleep_while_master_readies_up]
 }

xen_master.tf

@@ -3,14 +3,14 @@ locals {
 }
 
 resource "random_integer" "node" {
-    count = var.node_count
-    min   = 1000
-    max   = 9999
+  count = var.node_count
+  min   = 1000
+  max   = 9999
 }
 
 resource "xenorchestra_cloud_config" "node" {
-  count = var.node_count
-  name  = "ubuntu-base-config-node-${count.index}"
+  count    = var.node_count
+  name     = "ubuntu-base-config-node-${count.index}"
   template = <<EOF
 #cloud-config
 hostname: "${local.node_prefix}-${random_integer.node[count.index].result}.${var.dns_sub_zone}.${lower(var.dns_zone)}"
@@ -70,7 +70,7 @@ firewall:
       source: 0.0.0.0/0
 EOF
 
-depends_on = [ xenorchestra_vm.master ]
+  depends_on = [xenorchestra_vm.master]
 }
 
 resource "xenorchestra_vm" "node" {
@@ -104,8 +104,8 @@ resource "xenorchestra_vm" "node" {
   tags = concat(var.tags, var.node_tags, ["kubernetes.io/role:worker", "xcp-ng.org/deployment:${var.cluster_name}"])
 
   lifecycle {
-    ignore_changes = [ disk, affinity_host, template ]
+    ignore_changes = [disk, affinity_host, template]
   }
 
-  depends_on = [ xenorchestra_vm.master, null_resource.sleep_while_master_readies_up, xenorchestra_vm.secondary ]
+  depends_on = [xenorchestra_vm.master, null_resource.sleep_while_master_readies_up, xenorchestra_vm.secondary]
 }

xen_nodes.tf

@@ -1,6 +1,6 @@
 resource "xenorchestra_cloud_config" "secondary" {
-  count = var.master_count - 1
-  name  = "ubuntu-base-config-master-${count.index + 1}"
+  count    = var.master_count - 1
+  name     = "ubuntu-base-config-master-${count.index + 1}"
   template = <<EOF
 #cloud-config
 hostname: "${local.master_prefix}-${random_integer.master[count.index + 1].result}.${var.cluster_dns_zone}"
@@ -78,7 +78,7 @@ EOF
 
 
 resource "xenorchestra_vm" "secondary" {
-  count = var.master_count - 1
+  count                = var.master_count - 1
   name_label           = "${local.master_prefix}-${random_integer.master[count.index + 1].result}"
   cloud_config         = xenorchestra_cloud_config.secondary[count.index].template
   cloud_network_config = var.cloud_network_config_template
@@ -107,8 +107,8 @@ resource "xenorchestra_vm" "secondary" {
   tags = concat(var.tags, var.master_tags, ["kubernetes.io/role:secondary", "xcp-ng.org/deployment:${var.cluster_name}"])
 
   lifecycle {
-    ignore_changes = [ disk, affinity_host, template ]
+    ignore_changes = [disk, affinity_host, template]
   }
 
-  depends_on = [ xenorchestra_vm.master, null_resource.sleep_while_master_readies_up ]
+  depends_on = [xenorchestra_vm.master, null_resource.sleep_while_master_readies_up]
 }