airship/airshipctl
Code Issues Proposed changes

Merge "Added m3-gen integrity checks"

Browse Source
This commit is contained in:
Zuul 2021-05-11 17:07:10 +00:00 committed by Gerrit Code Review
commit 6c67f739e4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/function/hostgenerator-m3/hosttemplate.yaml
View File

@ -36,6 +36,12 @@ template: |
{{- $_ := set $host "hardwareProfile" "default" }} {{- $_ := set $host "hardwareProfile" "default" }}
{{- end }} {{- end }}
{{- $hardwareProfile := index $envAll.hardwareProfiles $host.hardwareProfile }} {{- $hardwareProfile := index $envAll.hardwareProfiles $host.hardwareProfile }}
{{- if not $hardwareProfile -}}
{{- fail (printf "can't find hardwareProfile %s" $host.hardwareProfile) -}}
{{- end -}}
{{- if not $hardwareProfile.firmware -}}
{{- fail (printf "hardwareProfile %s doesn't have firmware field" $host.hardwareProfile) -}}
{{- end -}}
--- ---
apiVersion: metal3.io/v1alpha1 apiVersion: metal3.io/v1alpha1
kind: BareMetalHost kind: BareMetalHost
@ -53,7 +59,7 @@ template: |
bmc: bmc:
address: {{ $host.bmcAddress }} address: {{ $host.bmcAddress }}
credentialsName: {{ $hostName }}-bmc-secret credentialsName: {{ $hostName }}-bmc-secret
disableCertificateVerification: {{ $host.disableCertificateVerification }} disableCertificateVerification: {{ default false $host.disableCertificateVerification }}
firmware: firmware:
{{ toYaml $hardwareProfile.firmware | indent 4 }} {{ toYaml $hardwareProfile.firmware | indent 4 }}
{{- /* If no raid is defined for a host, simply skip. There is no default setting for raid */ -}} {{- /* If no raid is defined for a host, simply skip. There is no default setting for raid */ -}}

2
manifests/site/test-site/target/catalogues/hosts.yaml
View File

@ -36,7 +36,7 @@ hosts:
macAddresses: macAddresses:
oam: 52:54:00:9b:27:02 oam: 52:54:00:9b:27:02
pxe: 52:54:00:b6:ed:02 pxe: 52:54:00:b6:ed:02
hardwareProfile: example # defined in the hardwareprofile-example function hardwareProfile: default
node03: node03:
bootMode: legacy bootMode: legacy
macAddress: 52:54:00:b6:ed:23 macAddress: 52:54:00:b6:ed:23