From 106877ba97a0464837bf34047492217fafcc89f3 Mon Sep 17 00:00:00 2001 From: Pierre Lafievre Date: Fri, 18 Oct 2024 16:20:56 +0200 Subject: [PATCH] B-542: fix DS_MAD for ceph datastore (#560) --------- Co-authored-by: Michal Opala --- CHANGELOG.md | 1 + opennebula/resource_opennebula_datastore.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ca4b4820..42797ec15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ BUG FIXES: * resources/opennebula_vm_group: fix anti affinity reading (#497) +* resources/opennebula_datastore: remove DS_MAD for Ceph SYSTEM datastore (#542) # 1.4.1 (Unreleased) diff --git a/opennebula/resource_opennebula_datastore.go b/opennebula/resource_opennebula_datastore.go index d2f3afa12..a9c059988 100644 --- a/opennebula/resource_opennebula_datastore.go +++ b/opennebula/resource_opennebula_datastore.go @@ -302,6 +302,7 @@ func resourceOpennebulaDatastoreCreate(ctx context.Context, d *schema.ResourceDa if dsType == "IMAGE" { tpl.Add("TM_MAD", "ceph") + tpl.Add("DS_MAD", "ceph") } else if dsType == "SYSTEM" { if cephAttrsMap["local_storage"].(bool) { tpl.Add("TM_MAD", "ssh") @@ -379,7 +380,6 @@ func resourceOpennebulaDatastoreCreate(ctx context.Context, d *schema.ResourceDa func addCephAttributes(attrs map[string]interface{}, tpl *datastore.Template) { - tpl.Add("DS_MAD", "ceph") tpl.Add("DISK_TYPE", "RBD") poolName := attrs["pool_name"].(string)