From f5412c313849cf78718eff14068b212e097ce48c Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Mon, 27 Feb 2023 14:13:58 +0100 Subject: [PATCH] fix(nebula): improve resource templates --- modules/nebula/main.tf | 9 ++++++--- modules/virtualMachine/locals.tf | 1 + modules/virtualMachine/main.tf | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/nebula/main.tf b/modules/nebula/main.tf index 188c81a..6c01048 100644 --- a/modules/nebula/main.tf +++ b/modules/nebula/main.tf @@ -12,7 +12,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 @@ -60,7 +60,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 @@ -84,9 +84,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 } + */ os { arch = "x86_64" diff --git a/modules/virtualMachine/locals.tf b/modules/virtualMachine/locals.tf index d10ce7a..1bd45eb 100644 --- a/modules/virtualMachine/locals.tf +++ b/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}" } diff --git a/modules/virtualMachine/main.tf b/modules/virtualMachine/main.tf index c69065b..68fc2db 100644 --- a/modules/virtualMachine/main.tf +++ b/modules/virtualMachine/main.tf @@ -1,4 +1,3 @@ - resource "opennebula_group" "main" { name = var.group }