Merge branch 'master' of https://forge.cadoles.com/CadolesKube/terracadoles

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,120 @@
+variable "vms" {
+    type = map
+    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_prod_ds" {
+  default = "101"
+}
+
+variable "one_sys_datastore" {
+  default = "100"
+}
+
+
+// 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_prod_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 = var.vms
+
+  name = "data-${each.key}.${each.value.domain}"
+  path = "https://vulcain.cadoles.com/empty_40G"
+  datastore_id = var.one_prod_ds 
+  description = "data disk for ${each.key}"
+  persistent = each.value.data_image_persistent
+  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
+  }
+
+  /* Not needed now
+  disk {
+    image_id = opennebula_image.data[each.key].id
+  }
+  */
+
+  sched_ds_requirements = ( each.value.sysdatastore != "" ? each.value.sysdatastore : var.one_sys_datastore )
+
+  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
+    }
+  }
+  permissions = var.permissions
+  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,13 +1,10 @@
-// Dependencies management
-resource "null_resource" "depends_on" {
-  triggers = {
-    depends_on = join("", var.depends)
-  }
+resource "opennebula_group" "main" {
+  name = var.group
 }
 
 // OpenNebula disk image !
 resource "opennebula_image" "system" {
-    name = var.system_image_name
+    name = local.system_image_name
     description = "System disk image"
     datastore_id = var.one_prod_ds 
     persistent = false
@@ -21,7 +18,7 @@ resource "opennebula_image" "system" {
 }
 
 resource "opennebula_image" "data" {
-    name = var.data_image_name
+    name = local.data_image_name
     description = "Data disk image"
     datastore_id = var.one_prod_ds 
     persistent = true
@@ -31,7 +28,7 @@ resource "opennebula_image" "data" {
     driver = "qcow2"
     format = "qcow2"
     permissions = "660"
-    group = "production"  
+    group = var.group 
 }
 
 // OpenNebula (VM) Template definition
@@ -59,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" {
@@ -78,12 +79,10 @@ resource "opennebula_template" "vm_template" {
 
 // OpenNebula Virtual Machine
 resource "opennebula_virtual_machine" "vm" {
-  name = var.vm_fqdn
+  name = local.fqdn
   group = var.group
-  timeout = 10
   template_id = opennebula_template.vm_template.id
-  depends_on = [ opennebula_template.vm_template,
-                 null_resource.depends_on ]
+  depends_on = [ opennebula_template.vm_template ]
 }
 
 resource "dns_a_record_set" "vm_dns_a_record" {    
@@ -102,7 +101,7 @@ resource "dns_cname_record" "vm_dns_cname_record" {
 
   zone  = var.vm_domain 
   name  = each.value
-  cname = "${var.vm_fqdn}."
+  cname = "${local.fqdn}."
   ttl   = 300
 
   depends_on = [ opennebula_virtual_machine.vm ]

modules/virtualMachine/outputs.tf

@@ -1,9 +1,13 @@
-output "virtual_machine_shortname" {
+output "shortname" {
   value = opennebula_virtual_machine.vm.name
 }
 
-output "virtual_machine_nic0_mac" {
-  value = opennebula_virtual_machine.vm.nic[0].mac
+output "fqdn" {
+  value = local.fqdn 
+}
+
+output "first_nic_mac" {
+  value = opennebula_virtual_machine.vm.template_nic[0].computed_mac
 }
 
 output "network_interfaces" {

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,16 @@ variable "vm_domain" {
   type = string
 }
 
-variable "system_image_name" {
-  description = "System image disk name"
-  type = string
-}
-
 variable "system_image_source" {
   description = "Virtual Machine system image source"
   type = string
-}
-
-variable "data_image_name" {
-  description = "Data image disk name"
-  type = string
+  default = "https://marketplace.opennebula.io//appliance/251b0578-6c47-4ba4-b184-dc6e873201a2/download/0"
 }
 
 variable "data_image_source" {
   description = "Virtual Machine data disk image source"
   type = string
+  default = "https://marketplace.opennebula.io//appliance/251b0578-6c47-4ba4-b184-dc6e873201a2/download/0"
 }
 
 variable "tag_labels" {
@@ -56,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" {
@@ -100,5 +90,10 @@ variable "graphics" {
     listen = "0.0.0.0"
     type = "VNC"
   }
-  
+}
+
+variable "imagemode" {
+  description = "Disk image mode"
+  type = string
+  default = "600"
 }

modules/virtualMachine/versions.tf

@@ -7,7 +7,8 @@ terraform {
       source = "hashicorp/null"
     }
     opennebula = {
-      source = "terraform-providers/opennebula"
+      source = "OpenNebula/opennebula"
+      version = "~> 1.0"
     }
   }
   required_version = ">= 0.13"