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

modules/nebula/main.tf

@@ -8,7 +8,7 @@ variable "image_format" {
 }
 
 variable "dev_prefix" {
-    default = "vd"
+    default = "sd"
 }
 
 variable "permissions" {
@@ -47,7 +47,7 @@ resource "opennebula_image" "system" {
   permissions = var.permissions
 }
 
-// data image
+/* data image not needed now
 resource "opennebula_image" "data" {
   for_each = var.vms
 
@@ -59,7 +59,7 @@ resource "opennebula_image" "data" {
   format = var.image_format
   dev_prefix = var.dev_prefix
   permissions = var.permissions
-}
+}*/
 
 resource "opennebula_template" "vm_template" {
   for_each = var.vms
@@ -83,9 +83,12 @@ resource "opennebula_template" "vm_template" {
   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 )
 

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
 }