Skip to content

Commit 383f2f4

Browse files
committed
Default to /dev/sda if no disk is found
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 6824a9a commit 383f2f4

3 files changed

Lines changed: 21 additions & 6 deletions

File tree

‎charts/cozystack/templates/_helpers.tpl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@ machine:
3434
image: {{ . }}
3535
{{- end }}
3636
{{- (include "talm.discovered.disks_info" .) | nindent 4 }}
37-
disk: {{ include "talm.discovered.system_disk_name" . | quote }}
37+
{{- $disk := include "talm.discovered.system_disk_name" . }}
38+
{{- if eq $disk "" }}
39+
disk: /dev/sda
40+
{{- else }}
41+
disk: {{ $disk | quote }}
42+
{{- end }}
3843
network:
3944
hostname: {{ include "talm.discovered.hostname" . | quote }}
4045
nameservers: {{ include "talm.discovered.default_resolvers" . }}

‎charts/generic/templates/_helpers.tpl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ machine:
77
{{- toYaml .Values.advertisedSubnets | nindent 8 }}
88
install:
99
{{- (include "talm.discovered.disks_info" .) | nindent 4 }}
10-
disk: {{ include "talm.discovered.system_disk_name" . | quote }}
10+
{{- $disk := include "talm.discovered.system_disk_name" . }}
11+
{{- if eq $disk "" }}
12+
disk: /dev/sda
13+
{{- else }}
14+
disk: {{ $disk | quote }}
15+
{{- end }}
1116
network:
1217
hostname: {{ include "talm.discovered.hostname" . | quote }}
1318
nameservers: {{ include "talm.discovered.default_resolvers" . }}

‎pkg/generated/presets.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ machine:
6464
image: {{ . }}
6565
{{- end }}
6666
{{- (include "talm.discovered.disks_info" .) | nindent 4 }}
67-
disk: {{- $disk := include "talm.discovered.system_disk_name" . }}
67+
{{- $disk := include "talm.discovered.system_disk_name" . }}
6868
{{- if eq $disk "" }}
69-
/dev/sda
69+
disk: /dev/sda
7070
{{- else }}
71-
{{ $disk | quote }}
71+
disk: {{ $disk | quote }}
7272
{{- end }}
7373
network:
7474
hostname: {{ include "talm.discovered.hostname" . | quote }}
@@ -180,7 +180,12 @@ machine:
180180
{{- toYaml .Values.advertisedSubnets | nindent 8 }}
181181
install:
182182
{{- (include "talm.discovered.disks_info" .) | nindent 4 }}
183-
disk: {{ include "talm.discovered.system_disk_name" . | quote }}
183+
{{- $disk := include "talm.discovered.system_disk_name" . }}
184+
{{- if eq $disk "" }}
185+
disk: /dev/sda
186+
{{- else }}
187+
disk: {{ $disk | quote }}
188+
{{- end }}
184189
network:
185190
hostname: {{ include "talm.discovered.hostname" . | quote }}
186191
nameservers: {{ include "talm.discovered.default_resolvers" . }}

0 commit comments

Comments
 (0)