diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-29 17:41:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-01-29 17:41:59 +0000 |
| commit | 142dc0cedc41f2954cd9141c18f0f4025afdfc98 (patch) | |
| tree | e6ca336937209883dd9426deabfa4d5547163afa /mcp/patches/salt-formula-maas | |
| parent | cfa81928082b380b15cce2d25e2c3d7c752e8faa (diff) | |
| parent | d1f1e51f0357266ecddaf63f619c7944c71f5858 (diff) | |
Merge "aarch64: Add kpti=off similar to x86_64 nopti"
Diffstat (limited to 'mcp/patches/salt-formula-maas')
| -rw-r--r-- | mcp/patches/salt-formula-maas/0006-curtin-Add-Bionic-support.patch | 20 |
1 files changed, 11 insertions, 9 deletions
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 <Alexandru.Avadanii@enea.com> --- - .../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"] |