From 740cac3c8faefd15997c52531a6d6376d3287b81 Mon Sep 17 00:00:00 2001 From: davidplunkett Date: Mon, 4 Nov 2019 03:24:24 +0000 Subject: [PATCH] re-enable bios_template to setup hardware Re-enable bios_template option to setup hardware for master and worker nodes. Signed-off-by: davidplunkett Change-Id: I174fa3f64bbb8f0ea9815b94cc924d40eb2aa68a --- dellgen10-sriov-a13.yaml | 2 +- scripts/update_bios_settings.py | 3 +++ tools/2genesis.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dellgen10-sriov-a13.yaml b/dellgen10-sriov-a13.yaml index c4e22a2..f18d764 100644 --- a/dellgen10-sriov-a13.yaml +++ b/dellgen10-sriov-a13.yaml @@ -235,7 +235,7 @@ hardware: generation: '10' hw_version: '3' bios_version: '2.8' - bios_template: + bios_template: dell_r740_g14_uefi_base.xml.template boot_template: dell_r740_g14_uefi_httpboot.xml.template http_boot_device: NIC.Slot.2-1-1 device_aliases: diff --git a/scripts/update_bios_settings.py b/scripts/update_bios_settings.py index 1412dfc..a7d6ff1 100644 --- a/scripts/update_bios_settings.py +++ b/scripts/update_bios_settings.py @@ -32,6 +32,9 @@ def create_node_rcfile(nodes, defaults, j2template, rcfile_suffix): if type(nodes) is list: for node in nodes: newnode = dict( defaults.items() + node.items() ) + if not "bios_template" in newnode or not newnode["bios_template"]: + print 'Skipping host {} because of missing or empty key [bios_template]'.format(newnode['name']) + continue data = template.render(yaml=newnode) rcfile = "server-config/"+newnode['name']+rcfile_suffix print rcfile diff --git a/tools/2genesis.sh b/tools/2genesis.sh index 2d63bf4..ca1941e 100755 --- a/tools/2genesis.sh +++ b/tools/2genesis.sh @@ -61,7 +61,7 @@ ssh $GENESIS_HOST << EOF EOF # Update BIOS settings on master and worker nodes -#python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml +python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml echo "#######################################" echo "# $0 finished" -- 2.16.6