Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion charts/cozystack/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ machine:
archive = 0
}
devices {
global_filter = [ "r|^/dev/drbd.*|", "r|^/dev/dm-.*|", "r|^/dev/zd.*|" ]
global_filter = [ "r|^/dev/drbd.*|", "r|^/dev/dm-.*|", "r|^/dev/zd.*|", "r|^/dev/loop.*|" ]
}
{{- with .Values.extraMachineFiles }}
{{- toYaml . | nindent 2 }}
Expand Down
7 changes: 5 additions & 2 deletions pkg/engine/contract_machine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -630,8 +630,10 @@ func TestContract_Machine_CertSANs_LoopbackUnconditional_Cozystack(t *testing.T)
// plugin paths. Required for SR-IOV / GPU device plugins to
// surface inside privileged containers.
// 2. /etc/lvm/lvm.conf — disables LVM backup/archive and sets a
// global_filter that excludes drbd, dm-, zd- devices. Required so
// LVM does not race the storage stack at boot.
// global_filter that excludes drbd, dm-, zd-, loop devices.
// Required so LVM does not race the storage stack at boot, and
// so the host never activates a volume group living inside a
// loop-mounted image.
//
// Both files use op: create / op: overwrite respectively. A regression
// removing either silently breaks GPU/SRIOV or LVM ordering.
Expand All @@ -651,6 +653,7 @@ func TestContract_Machine_Files_Cozystack(t *testing.T) {
assertContains(t, out, `r|^/dev/drbd.*|`)
assertContains(t, out, `r|^/dev/dm-.*|`)
assertContains(t, out, `r|^/dev/zd.*|`)
assertContains(t, out, `r|^/dev/loop.*|`)
})
}
}
Expand Down
Loading