From 30b8abf04744ec71e4e608bc57e3b29872ed61a8 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 29 Jan 2020 15:40:12 +0100 Subject: aarch64: Add kpti=off similar to x86_64 nopti arm64 kernels use a different kernel option (kpti=off vs nopti) to disable PTI, so sync the two platform configurations. Conveniently, this also bypasses kernel 4.15 issues described in [1], so apply the kernel option customisation via MaaS too, to allow aarch64 deployments to bootstrap using 4.15 kernel (with the downside of these args being duplicated by Salt later in HA scenarios). PTI is now disabled for baremetal nodes (via MaaS, no matter the scenario) and/or for kvm/cmp hosts (in HA scenarios only). While at it, install missing thin provisioning tools in aarch64 bootstrap image for MaaS deploy stage to succeed. [1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857074 Change-Id: Ibd1f57f24abc690b0f13b6298f25d7e8a1af1567 Signed-off-by: Alexandru Avadanii (cherry picked from commit d1f1e51f0357266ecddaf63f619c7944c71f5858) --- .../0006-curtin-Add-Bionic-support.patch | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'mcp/patches/salt-formula-maas') diff --git a/mcp/patches/salt-formula-maas/0006-curtin-Add-Bionic-support.patch b/mcp/patches/salt-formula-maas/0006-curtin-Add-Bionic-support.patch index 791f8eec7..c69507b20 100644 --- a/mcp/patches/salt-formula-maas/0006-curtin-Add-Bionic-support.patch +++ b/mcp/patches/salt-formula-maas/0006-curtin-Add-Bionic-support.patch @@ -12,19 +12,19 @@ Subject: [PATCH] curtin: Add Bionic support Signed-off-by: Alexandru Avadanii --- - .../curtin_userdata_amd64_generic_bionic | 83 +++++++++++++++++++ - .../curtin_userdata_arm64_generic_bionic | 78 +++++++++++++++++ + .../curtin_userdata_amd64_generic_bionic | 84 +++++++++++++++++++ + .../curtin_userdata_arm64_generic_bionic | 79 +++++++++++++++++ maas/region.sls | 24 ++++++ - 3 files changed, 185 insertions(+) + 3 files changed, 187 insertions(+) create mode 100644 maas/files/curtin_userdata_amd64_generic_bionic create mode 100644 maas/files/curtin_userdata_arm64_generic_bionic diff --git a/maas/files/curtin_userdata_amd64_generic_bionic b/maas/files/curtin_userdata_amd64_generic_bionic new file mode 100644 -index 0000000..c28721a +index 0000000..11af3cf --- /dev/null +++ b/maas/files/curtin_userdata_amd64_generic_bionic -@@ -0,0 +1,83 @@ +@@ -0,0 +1,84 @@ +{%- from "maas/map.jinja" import cluster with context %} +{%- raw %} +#cloud-config @@ -33,8 +33,9 @@ index 0000000..c28721a + {{for line in str(curtin_preseed).splitlines()}} + {{line}} + {{endfor}} -+{{if third_party_drivers and driver}} +early_commands: ++ thin_tools_install: ["sh", "-c", "apt-get update --quiet && apt-get --assume-yes install thin-provisioning-tools"] ++{{if third_party_drivers and driver}} + {{py: key_string = ''.join(['\\x%x' % x for x in map(ord, driver['key_binary'])])}} + driver_00_get_key: /bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg + driver_01_add_key: ["apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"] @@ -110,10 +111,10 @@ index 0000000..c28721a +#} diff --git a/maas/files/curtin_userdata_arm64_generic_bionic b/maas/files/curtin_userdata_arm64_generic_bionic new file mode 100644 -index 0000000..d14388a +index 0000000..006d8c2 --- /dev/null +++ b/maas/files/curtin_userdata_arm64_generic_bionic -@@ -0,0 +1,78 @@ +@@ -0,0 +1,79 @@ +{%- from "maas/map.jinja" import cluster with context %} +{% raw %} +#cloud-config @@ -122,8 +123,9 @@ index 0000000..d14388a + {{for line in str(curtin_preseed).splitlines()}} + {{line}} + {{endfor}} -+{{if third_party_drivers and driver}} +early_commands: ++ thin_tools_install: ["sh", "-c", "apt-get update --quiet && apt-get --assume-yes install thin-provisioning-tools"] ++{{if third_party_drivers and driver}} + {{py: key_string = ''.join(['\\x%x' % x for x in map(ord, driver['key_binary'])])}} + driver_00_get_key: /bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg + driver_01_add_key: ["apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"] -- cgit 1.2.3-korg