airship
/
maas
Code Issues Proposed changes

Merge "bugfix: Ensure kernel_package param is not required"

This commit is contained in:
Zuul 2018-10-19 16:06:50 +00:00 committed by Gerrit Code Review
parent e53cb2d237 037bde9934
commit 48c6c20a7f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
images/maas-region-controller/2.3_kernel_package.patch
View File

@ -1,12 +1,15 @@
--- preseed.py 2018-10-15 12:52:41.611027184 -0700 --- preseed.py 2018-10-15 12:52:41.611027184 -0700
+++ preseed2.py 2018-10-16 13:42:51.824755746 -0700 +++ preseed2.py 2018-10-19 07:26:10.985282758 -0700
@@ -317,7 +317,23 @@ @@ -317,7 +317,25 @@
The BootResourceFile table contains a mapping between hwe kernels and The BootResourceFile table contains a mapping between hwe kernels and
Ubuntu package names. If this mapping is missing we fall back to letting Ubuntu package names. If this mapping is missing we fall back to letting
Curtin figure out which kernel should be installed""" Curtin figure out which kernel should be installed"""
- kpackage = BootResource.objects.get_kpackage_for_node(node) +
+ # previous logic to retrieve kpackage parameter
kpackage = BootResource.objects.get_kpackage_for_node(node)
+ +
+ # determine if this node has kernel parameters applied by drydock + # determine if this node has kernel parameters applied by drydock
+ # and override kpackage if we discover the right properties
+ kernel_opt_tag = "%s_kp" % (node.hostname) + kernel_opt_tag = "%s_kp" % (node.hostname)
+ if kernel_opt_tag in node.tag_names(): + if kernel_opt_tag in node.tag_names():
+ +
@ -19,8 +22,6 @@
+ kdict = dict(kparam.split('=') for kparam in kparams) + kdict = dict(kparam.split('=') for kparam in kparams)
+ if 'kernel_package' in kdict: + if 'kernel_package' in kdict:
+ kpackage = kdict['kernel_package'] + kpackage = kdict['kernel_package']
+ else:
+ kpackage = BootResource.objects.get_kpackage_for_node(node)
+ +
if kpackage: if kpackage:
kernel_config = { kernel_config = {