fix conflict

This modules is made for matchbox/typhoon Kubernetes provisionning
so we need to use "Ethernet" networks and not IPs.

README.md

@@ -1,3 +1,9 @@
 # terracadoles
 
-Cadoles Terraform modules
+Cadoles Terraform modules
+
+## Modules
+
+* virtualMachine
+* dns
+* nebula

modules/nebula/main.tf

@@ -0,0 +1,165 @@
+variable "vms" {
+    type = map(string,object(
+      {
+        domain = string
+        cpu = number
+        vcpu = number
+        ram = number
+        system_image_persistent = bool
+        data_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"
+}
+
+variable "image_format" {
+    default = "qcow2"
+}
+
+variable "dev_prefix" {
+    default = "sd"
+}
+
+variable "permissions" {
+    default = "600"
+}
+
+variable "graphics" {
+    default = {
+        keymap = "fr"
+        listen = "0.0.0.0"
+        type = "VNC"
+    }
+  
+}
+
+variable "one_image_ds" {
+  default = "101"
+}
+
+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" {
+  for_each = var.vms
+
+  name = "system-${each.key}.${each.value.domain}"
+  description = "System disk for ${each.key}"
+  datastore_id = var.one_image_ds 
+  path = "https://vulcain.cadoles.com/empty_20G"
+  persistent = each.value.system_image_persistent
+  format = var.image_format
+  dev_prefix = var.dev_prefix
+  permissions = var.permissions
+}
+
+
+// data image not needed now
+resource "opennebula_image" "data" {
+  for_each = {
+     for ds in local.data_disks : "${ds.vm_key}.${ds.name}" => ds
+  }
+
+  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
+}
+
+resource "opennebula_template" "vm_template" {
+  for_each = var.vms
+
+  name = "${each.key}.${each.value.domain}"
+  cpu = each.value.cpu
+  vcpu = each.value.vcpu
+  memory = each.value.ram
+  graphics {
+    keymap = var.graphics.keymap
+    listen = var.graphics.listen
+    type = var.graphics.type
+  }
+  context = {
+    SET_HOSTNAME = "$NAME"
+    DNS_HOSTNAME = "YES"
+    NETWORK = "YES"
+    SSH_PUBLIC_KEY = "$USER[SSH_PUBLIC_KEY]"
+    USERNAME = "root"
+  }
+  disk {
+    image_id = opennebula_image.system[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 != "" ? "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
+
+    content {
+      network_id = nic.value.network_id
+      model = "virtio"
+      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" {
+  for_each = var.vms
+  name = "${each.key}.${each.value.domain}"
+  template_id = opennebula_template.vm_template[each.key].id
+  depends_on = [ opennebula_template.vm_template ]
+}

modules/nebula/output.tf

@@ -0,0 +1,11 @@
+output "shortnames" {
+  value = keys(var.vms)
+}
+
+output "first_macs" {
+  value = opennebula_virtual_machine.vm //FIXME .template_nic[0].computed_mac
+}
+
+output "virtual_machines" {
+  value = opennebula_virtual_machine.vm //template_nic[0].computed_mac)
+}

modules/nebula/version.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_providers {
+    opennebula = {
+      source = "OpenNebula/opennebula"
+      version = "~> 1.0"
+    }
+  }
+}
+

modules/virtualMachine/locals.tf

@@ -0,0 +1,7 @@
+locals {
+   fqdn = "${var.vm_shortname}.${var.vm_domain}"
+   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,3 +1,7 @@
+resource "opennebula_group" "main" {
+  name = var.group
+}
+
 // OpenNebula disk image !
 resource "opennebula_image" "system" {
     name = local.system_image_name
@@ -24,7 +28,7 @@ resource "opennebula_image" "data" {
     driver = "qcow2"
     format = "qcow2"
     permissions = "660"
-    group = "production"  
+    group = var.group 
 }
 
 // OpenNebula (VM) Template definition
@@ -52,6 +56,10 @@ resource "opennebula_template" "vm_template" {
     image_id = opennebula_image.data.id
   }
 
+  os {
+    arch = "x86_64"
+    boot = "disk0,nic0"
+  }
   //labels = var.tag_labels
 
   dynamic "nic" {

modules/virtualMachine/outputs.tf

@@ -3,7 +3,7 @@ output "shortname" {
 }
 
 output "fqdn" {
-  value = var.vm_fqdn 
+  value = local.fqdn 
 }
 
 output "first_nic_mac" {

modules/virtualMachine/variables.tf

@@ -8,11 +8,6 @@ variable "one_prod_ds" {
   type = string
 }
 
-variable "vm_fqdn" {
-  description = "Virtual Machine FQDN Name"
-  type = string
-}
-
 variable "vm_shortname" {
   description = "Virtual machine short name"
   type = string
@@ -23,24 +18,12 @@ variable "vm_domain" {
   type = string
 }
 
-variable "system_image_name" {
-  description = "System image disk name"
-  type = string
-  default = "${var.vm_shortname}.system"
-}
-
 variable "system_image_source" {
   description = "Virtual Machine system image source"
   type = string
   default = "https://marketplace.opennebula.io//appliance/251b0578-6c47-4ba4-b184-dc6e873201a2/download/0"
 }
 
-variable "data_image_name" {
-  description = "Data image disk name"
-  type = string
-  default = "${var.vm_shortname}.data"
-}
-
 variable "data_image_source" {
   description = "Virtual Machine data disk image source"
   type = string
@@ -60,16 +43,19 @@ variable "network_interfaces" {
 variable "cpu" {
   description = "VM CPU"
   type = string
+  default = "0.2"
 }
 
 variable "vcpu" {
   description = "VM vCPU"
   type = string
+  default = "2"
 }
 
 variable "ram" {
   description = "VM RAM"
   type = string
+  default = "512"
 }
 
 variable "depends" {
@@ -109,5 +95,5 @@ variable "graphics" {
 variable "imagemode" {
   description = "Disk image mode"
   type = string
-  default = "0600"
+  default = "600"
 }