summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-19 16:06:50 +0000
committerGerrit Code Review <review@openstack.org>2018-10-19 16:06:50 +0000
commit48c6c20a7fa2f8e3dc4cf0ab79b38e47ea86dc0f (patch)
tree7f248e691803dd2acb056aebb99bfe3f3599d47e
parente53cb2d23700467ae939aba8b7a62f74b1f5f718 (diff)
parent037bde993421857af1b39955354341395ed2a858 (diff)
Merge "bugfix: Ensure kernel_package param is not required"
-rw-r--r--images/maas-region-controller/2.3_kernel_package.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/images/maas-region-controller/2.3_kernel_package.patch b/images/maas-region-controller/2.3_kernel_package.patch
index 8ac56cd..943e8c1 100644
--- a/images/maas-region-controller/2.3_kernel_package.patch
+++ b/images/maas-region-controller/2.3_kernel_package.patch
@@ -1,12 +1,15 @@
1--- preseed.py 2018-10-15 12:52:41.611027184 -0700 1--- preseed.py 2018-10-15 12:52:41.611027184 -0700
2+++ preseed2.py 2018-10-16 13:42:51.824755746 -0700 2+++ preseed2.py 2018-10-19 07:26:10.985282758 -0700
3@@ -317,7 +317,23 @@ 3@@ -317,7 +317,25 @@
4 The BootResourceFile table contains a mapping between hwe kernels and 4 The BootResourceFile table contains a mapping between hwe kernels and
5 Ubuntu package names. If this mapping is missing we fall back to letting 5 Ubuntu package names. If this mapping is missing we fall back to letting
6 Curtin figure out which kernel should be installed""" 6 Curtin figure out which kernel should be installed"""
7- kpackage = BootResource.objects.get_kpackage_for_node(node) 7+
8+ # previous logic to retrieve kpackage parameter
9 kpackage = BootResource.objects.get_kpackage_for_node(node)
8+ 10+
9+ # determine if this node has kernel parameters applied by drydock 11+ # determine if this node has kernel parameters applied by drydock
12+ # and override kpackage if we discover the right properties
10+ kernel_opt_tag = "%s_kp" % (node.hostname) 13+ kernel_opt_tag = "%s_kp" % (node.hostname)
11+ if kernel_opt_tag in node.tag_names(): 14+ if kernel_opt_tag in node.tag_names():
12+ 15+
@@ -19,8 +22,6 @@
19+ kdict = dict(kparam.split('=') for kparam in kparams) 22+ kdict = dict(kparam.split('=') for kparam in kparams)
20+ if 'kernel_package' in kdict: 23+ if 'kernel_package' in kdict:
21+ kpackage = kdict['kernel_package'] 24+ kpackage = kdict['kernel_package']
22+ else:
23+ kpackage = BootResource.objects.get_kpackage_for_node(node)
24+ 25+
25 if kpackage: 26 if kpackage:
26 kernel_config = { 27 kernel_config = {