fix(vmware): adding network interface definiton for ovf imports

Now we have to tell witch boot firmware to use 'efi' of 'bios'

README.md

@@ -7,3 +7,4 @@ Cadoles Terraform modules
 * virtualMachine
 * dns
 * nebula
+* vmware

modules/nebula/main.tf

@@ -1,5 +1,24 @@
 variable "vms" {
-    type = map
+    type = map(object(
+      {
+        domain = string
+        cpu = number
+        vcpu = number
+        ram = number
+        system_image_persistent = bool
+        data_disks = list(object({
+          name = string
+          size = string
+          persistent = bool
+        }))
+        network_interfaces = list(object({
+          network_id = string
+          ip = string
+          mac = string
+        }))
+        sysdatastore = string
+      }
+    ))
     description = "Virtual Machines description"
 }
 
@@ -8,7 +27,7 @@ variable "image_format" {
 }
 
 variable "dev_prefix" {
-    default = "vd"
+    default = "sd"
 }
 
 variable "permissions" {
@@ -24,7 +43,7 @@ variable "graphics" {
   
 }
 
-variable "one_prod_ds" {
+variable "one_image_ds" {
   default = "101"
 }
 
@@ -32,6 +51,18 @@ variable "one_sys_datastore" {
   default = "100"
 }
 
+locals {
+  data_disks = flatten([
+    for vm_key, vm in var.vms : [
+       for disk in vm.data_disks : {
+          vm_key = "${vm_key}.${vm.domain}"
+          name = disk.name
+          size = disk.size
+          persist = disk.persistent
+       }
+    ]
+   ])
+}
   
 // system image
 resource "opennebula_image" "system" {
@@ -39,7 +70,7 @@ resource "opennebula_image" "system" {
 
   name = "system-${each.key}.${each.value.domain}"
   description = "System disk for ${each.key}"
-  datastore_id = var.one_prod_ds 
+  datastore_id = var.one_image_ds 
   path = "https://vulcain.cadoles.com/empty_20G"
   persistent = each.value.system_image_persistent
   format = var.image_format
@@ -47,15 +78,18 @@ resource "opennebula_image" "system" {
   permissions = var.permissions
 }
 
-// data image
-resource "opennebula_image" "data" {
-  for_each = var.vms
 
-  name = "data-${each.key}.${each.value.domain}"
+// data image not needed now
-  path = "https://vulcain.cadoles.com/empty_40G"
+resource "opennebula_image" "data" {
-  datastore_id = var.one_prod_ds 
+  for_each = {
-  description = "data disk for ${each.key}"
+     for ds in local.data_disks : "${ds.vm_key}.${ds.name}" => ds
-  persistent = each.value.data_image_persistent
+  }
+
+  name = "${each.value.vm_key}-data-${each.value.name}"
+  path = "https://vulcain.cadoles.com/empty_${each.value.size}"
+  datastore_id = var.one_image_ds
+  description = "Data disk of ${each.value.size} for ${each.value.vm_key}"
+  persistent = each.value.persist
   format = var.image_format
   dev_prefix = var.dev_prefix
   permissions = var.permissions
@@ -83,17 +117,24 @@ resource "opennebula_template" "vm_template" {
   disk {
     image_id = opennebula_image.system[each.key].id
   }
-  disk {
+
-    image_id = opennebula_image.data[each.key].id
+  dynamic "disk" {
+    for_each = {
+      for ds in local.data_disks : "${ds.vm_key}.${ds.name}" => ds if "${each.key}.${each.value.domain}" == ds.vm_key
+    }
+    iterator = current_disk
+    content {
+      image_id = opennebula_image.data[current_disk.key].id
+    }
   }
 
-  sched_ds_requirements = ( each.value.sysdatastore != "" ? each.value.sysdatastore : var.one_sys_datastore )
+  //sched_ds_requirements = ( each.value.sysdatastore != "" ? "ID=\"${each.value.sysdatastore}\"" : "ID=\"${var.one_sys_datastore}\"" )
+  sched_ds_requirements = ( each.value.sysdatastore != "" ? "ID=\"${each.value.sysdatastore}\"" : "" )
 
   os {
     arch = "x86_64"
     boot = "disk0,nic0"
   }
-  //labels = var.tag_labels
 
   dynamic "nic" {
     for_each = each.value.network_interfaces
@@ -101,12 +142,17 @@ resource "opennebula_template" "vm_template" {
     content {
       network_id = nic.value.network_id
       model = "virtio"
-      mac = nic.value.mac
+      mac = ( nic.value.mac != "" ? nic.value.mac : "" )
+      ip = ( nic.value.ip != "" ? nic.value.ip : "" )
     }
   }
   permissions = var.permissions
+  depends_on = [  opennebula_image.system ]
+
+  /* Not needed now
   depends_on = [ opennebula_image.system,
                  opennebula_image.data ]
+  */
 }
 
 resource "opennebula_virtual_machine" "vm" {

modules/virtualMachine/locals.tf

@@ -3,4 +3,5 @@ locals {
    system_image_name = "system.${local.fqdn}"
    system_image_source = var.system_image_source
    data_image_name = "data.${local.fqdn}"
+   group = "${var.group}"
 }

modules/virtualMachine/main.tf

@@ -1,4 +1,3 @@
-
 resource "opennebula_group" "main" {
   name = var.group
 }

modules/vmware/main.tf

@@ -0,0 +1,91 @@
+data "vsphere_datacenter" "datacenter" {
+  name = var.cluster.datacenter_name
+}
+
+data "vsphere_datastore" "datastore" {
+  name = var.cluster.datastore_name
+  datacenter_id = data.vsphere_datacenter.datacenter.id
+}
+
+data "vsphere_resource_pool" "pool" {
+  name          = var.cluster.resource_pool_name
+  datacenter_id = data.vsphere_datacenter.datacenter.id
+}
+
+data "vsphere_host" "host" {
+  name          = "10.253.10.50"
+  datacenter_id = data.vsphere_datacenter.datacenter.id
+}
+
+data "vsphere_network" "network" {
+  for_each = var.cluster.vnets
+
+  name          = each.value.name
+  datacenter_id = data.vsphere_datacenter.datacenter.id
+}
+
+resource "vsphere_virtual_machine" "vm" {
+  for_each = var.vms
+  name = "${each.key}.${each.value.domain}"
+  resource_pool_id = data.vsphere_resource_pool.pool.id
+  datastore_id     = data.vsphere_datastore.datastore.id
+  folder           = each.value.folder
+  num_cpus         = each.value.cpu
+  memory           = each.value.ram
+  guest_id         = each.value.guest_id
+  firmware         = each.value.firmware
+
+  dynamic "network_interface" {
+    for_each = each.value.network_interfaces
+    //for_each = { for idx, value in each.value.network_interfaces : idx => value }
+    //for_each = { for idx, vnet in data.vsphere_network.network : idx => vnet }
+    content {
+      network_id = data.vsphere_network.network[network_interface.value.id].id
+      use_static_mac = true
+      mac_address = network_interface.value.mac
+    }
+  }
+
+  dynamic "disk" {
+    for_each = each.value.disks 
+    content {
+      label = disk.key
+      size = disk.value.size
+      thin_provisioned = disk.value.thin_provisioned
+      unit_number = disk.value.unit_number
+    }
+  }
+}
+
+resource "vsphere_virtual_machine" "ova" {
+  for_each = var.ovfs
+  name = "${each.key}.${each.value.domain}"
+  resource_pool_id = data.vsphere_resource_pool.pool.id
+  datastore_id     = data.vsphere_datastore.datastore.id
+  host_system_id   = data.vsphere_host.host.id
+  folder           = var.cluster.folder
+
+  wait_for_guest_net_timeout = 0
+  wait_for_guest_ip_timeout  = 0
+
+  dynamic "network_interface" {
+    for_each = each.value.network_map
+    content {
+      network_id = data.vsphere_network.network[network_interface.value].id
+    }
+  }
+
+  ovf_deploy {
+    allow_unverified_ssl_cert = each.value.allow_unverified_ssl_cert
+    remote_ovf_url            = each.value.remote_ovf_url
+    disk_provisioning         = each.value.disk_provisioning
+    ip_protocol               = each.value.ip_protocol
+    ip_allocation_policy      = each.value.ip_allocation_policy
+    ovf_network_map = {
+      "Network 1" = data.vsphere_network.network[each.value.network_map[0]].id
+    }
+  }
+  vapp {
+    properties = each.value.vapp_properties
+  }
+}

modules/vmware/output.tf

@@ -0,0 +1,7 @@
+output "shortnames" {
+  value = keys(var.vms)
+}
+
+//output "virtual_machines" {
+//  value = vsphere.virtual_machine.vm //template_nic[0].computed_mac)
+//}

modules/vmware/variables.tf

@@ -0,0 +1,55 @@
+variable "vms" {
+    type = map(object(
+      {
+        domain = string
+        cpu = number
+        ram = number
+        guest_id = string
+        firmware = string
+        disks = map(object({
+          size = string
+          thin_provisioned = bool
+          unit_number = number
+        }))
+        network_interfaces = list(object(
+          {
+            id = string
+            mac = string
+          }
+        ))
+        folder = string
+      }
+    ))
+    description = "Virtual Machines description"
+}
+
+variable "cluster" {
+  type = object({
+      datacenter_name = string
+      datastore_name = string
+      resource_pool_name = string
+      folder = string
+      vnets = map(object({
+        name = string
+      }))
+    }
+  )
+  description = "vSphere cluster definition"
+}
+
+variable "ovfs" {
+    type = map(object(
+      {
+        domain = string
+        allow_unverified_ssl_cert = bool
+        remote_ovf_url            = string
+        disk_provisioning         = string
+        ip_protocol = string
+        ip_allocation_policy = string
+        network_map = list(string)
+        vapp_properties = object({})
+      }
+    ))
+    description = "Virtual Machines description"
+    default = {}
+}

modules/vmware/version.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    vsphere = {
+      source  = "hashicorp/vsphere"
+      version = "~> 2.5.1"
+    }
+  }
+}