Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

B-542: fix DS_MAD for ceph datastore #560

Merged
merged 2 commits into from
Oct 18, 2024
Merged

B-542: fix DS_MAD for ceph datastore #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd0ee1a
B #542: fix DS_MAD for ceph datastore
treywelsh Jul 1, 2024
c473271
Update CHANGELOG.md
sk4zuzu Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion opennebula/resource_opennebula_datastore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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)
Expand Down
Loading